+ echo '====== automated-ec2-builds [/tmp/automated-ec2-builds] ======' ====== automated-ec2-builds [/tmp/automated-ec2-builds] ====== + cd /tmp/automated-ec2-builds + bzr info Standalone tree (format: 2a) Location: branch root: . Related branches: parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/automated-ec2-builds/ + bzr version-info revision-id: ben.howard@canonical.com-20130123222211-0bcgm239lcitxriu date: 2013-01-23 15:22:11 -0700 build-date: 2013-01-24 07:04:20 +0000 revno: 529 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 529 committer: Ben Howard branch nick: automated-ec2-builds timestamp: Wed 2013-01-23 15:22:11 -0700 message: Add Juju banner for precise and later diff: === removed file 'live-config/common/hooks/053-update-motd.chroot' --- live-config/common/hooks/053-update-motd.chroot 2011-12-01 19:28:52 +0000 +++ live-config/common/hooks/053-update-motd.chroot 1970-01-01 00:00:00 +0000 @@ -1,13 +0,0 @@ -#!/bin/bash -cat < /etc/update-motd.d/51_update-motd -#!/bin/sh - -echo "---------------------------------------------------------------------" -echo "At the moment, only the core of the system is installed. To tune the " -echo "system to your needs, you can choose to install one or more " -echo "predefined collections of software by running the following " -echo "command: " -echo " " -echo " sudo tasksel --section server " -echo "---------------------------------------------------------------------" -EOF === modified file 'vmbuilder-cloudimg-fixes' --- vmbuilder-cloudimg-fixes 2012-11-06 18:23:59 +0000 +++ vmbuilder-cloudimg-fixes 2013-01-23 22:22:11 +0000 @@ -82,6 +82,15 @@ echo "Get cloud support with Ubuntu Advantage Cloud Guest" echo " http://www.ubuntu.com/business/services/cloud" EOF + +if dist_ge "${codename}" precise; then + cat >> "${rootd}/etc/update-motd.d/98-cloudguest" << EOF +echo "" +echo "Use Juju to deploy your cloud instances and workloads." +echo " https://juju.ubuntu.com/#cloud-${codename}" +EOF +fi + chmod +x "${rootd}/etc/update-motd.d/98-cloudguest" #### END COMMON ARCH FUNCTIONS + echo '' + echo '====== ec2-publishing-scripts [/tmp/ec2-publishing-scripts] ======' ====== ec2-publishing-scripts [/tmp/ec2-publishing-scripts] ====== + cd /tmp/ec2-publishing-scripts + bzr info Standalone tree (format: unnamed) Location: branch root: . Related branches: parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts/ + bzr version-info revision-id: ben.howard@canonical.com-20130114181718-e4datnu5um49f2nq date: 2013-01-14 11:17:18 -0700 build-date: 2013-01-24 07:04:21 +0000 revno: 499 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 499 committer: Ben Howard branch nick: ec2-publishing-scripts timestamp: Mon 2013-01-14 11:17:18 -0700 message: Removed previous pv-grub versions. Per Amazon's request, only the latest version of PVGRUB will be used. Current version is 1.03, which fixes an issue with the console not logging. diff: === removed file 'kernels-pv-grub-hd0-V1.01.txt' --- kernels-pv-grub-hd0-V1.01.txt 2012-11-12 23:13:35 +0000 +++ kernels-pv-grub-hd0-V1.01.txt 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ -# region id arch type manifest-or-name -ap-northeast-1 aki-d209a2d3 i386 kernel ec2-public-images-ap-northeast-1/pv-grub-hd0-V1.01-i386.gz.manifest.xml -ap-southeast-1 aki-13d5aa41 i386 kernel ec2-public-images-ap-southeast-1/pv-grub-hd0-V1.01-i386.gz.manifest.xml -ap-southeast-2 aki-33990e09 i386 kernel amazon/pv-grub-hd0_1.03-i386.gz -eu-west-1 aki-4deec439 i386 kernel ec2-public-images-eu/pv-grub-hd0-V1.01-i386.gz.manifest.xml -sa-east-1 aki-863ce39b i386 kernel ec2-public-images/pv-grub-hd0-V1.01-i386.gz.manifest.xml -us-east-1 aki-407d9529 i386 kernel ec2-public-images/pv-grub-hd0-V1.01-i386.gz.manifest.xml -us-west-1 aki-99a0f1dc i386 kernel ec2-public-images-us-west-1/pv-grub-hd0-V1.01-i386.gz.manifest.xml -us-west-2 aki-dce26fec i386 kernel ec2-public-images-us-west-2/pv-grub-hd0-V1.01-i386.gz.manifest.xml -ap-northeast-1 aki-d409a2d5 amd64 kernel ec2-public-images-ap-northeast-1/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml -ap-southeast-1 aki-11d5aa43 amd64 kernel ec2-public-images-ap-southeast-1/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml -ap-southeast-2 aki-31990e0b amd64 kernel amazon/pv-grub-hd0_1.03-x86_64.gz -eu-west-1 aki-4feec43b amd64 kernel ec2-public-images-eu/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml -sa-east-1 aki-d63ce3cb amd64 kernel ec2-public-images/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml -us-east-1 aki-427d952b amd64 kernel ec2-public-images/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml -us-west-1 aki-9ba0f1de amd64 kernel ec2-public-images-us-west-1/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml -us-west-2 aki-ace26f9c amd64 kernel ec2-public-images-us-west-2/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml === removed file 'kernels-pv-grub-hd0-V1.02.txt' --- kernels-pv-grub-hd0-V1.02.txt 2012-11-12 23:13:35 +0000 +++ kernels-pv-grub-hd0-V1.02.txt 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ -# region id arch type manifest-or-name -ap-northeast-1 aki-ec5df7ed i386 kernel ec2-public-images-ap-northeast-1/pv-grub-hd0_1.02-i386.gz.manifest.xml -ap-southeast-1 aki-a4225af6 i386 kernel ec2-public-images-ap-southeast-1/pv-grub-hd0_1.02-i386.gz.manifest.xml -ap-southeast-2 aki-33990e09 i386 kernel amazon/pv-grub-hd0_1.03-i386.gz -eu-west-1 aki-64695810 i386 kernel ec2-public-images-eu/pv-grub-hd0_1.02-i386.gz.manifest.xml -sa-east-1 aki-bc3ce3a1 i386 kernel ec2-public-images/pv-grub-hd0_1.02-i386.gz.manifest.xml -us-east-1 aki-805ea7e9 i386 kernel ec2-public-images/pv-grub-hd0_1.02-i386.gz.manifest.xml -us-west-1 aki-83396bc6 i386 kernel ec2-public-images-us-west-1/pv-grub-hd0_1.02-i386.gz.manifest.xml -us-west-2 aki-c2e26ff2 i386 kernel ec2-public-images-us-west-2/pv-grub-hd0_1.02-i386.gz.manifest.xml -ap-northeast-1 aki-ee5df7ef amd64 kernel ec2-public-images-ap-northeast-1/pv-grub-hd0_1.02-amd64.gz.manifest.xml -ap-southeast-1 aki-aa225af8 amd64 kernel ec2-public-images-ap-southeast-1/pv-grub-hd0_1.02-amd64.gz.manifest.xml -ap-southeast-2 aki-31990e0b amd64 kernel amazon/pv-grub-hd0_1.03-x86_64.gz -eu-west-1 aki-62695816 amd64 kernel ec2-public-images-eu/pv-grub-hd0_1.02-amd64.gz.manifest.xml -sa-east-1 aki-cc3ce3d1 amd64 kernel ec2-public-images/pv-grub-hd0_1.02-amd64.gz.manifest.xml -us-east-1 aki-825ea7eb amd64 kernel ec2-public-images/pv-grub-hd0_1.02-amd64.gz.manifest.xml -us-west-1 aki-8d396bc8 amd64 kernel ec2-public-images-us-west-1/pv-grub-hd0_1.02-amd64.gz.manifest.xml -us-west-2 aki-98e26fa8 amd64 kernel ec2-public-images-us-west-2/pv-grub-hd0_1.02-x86_64.gz.manifest.xml === renamed file 'kernels-pv-grub-hd0-V1.03.txt' => 'kernels-pv-grub-hd0.txt' === modified file 'publish-build' --- publish-build 2012-12-20 15:10:19 +0000 +++ publish-build 2013-01-14 18:17:18 +0000 @@ -188,14 +188,9 @@ serial=$(basename "${bd_fp}"); fi -kernel_list_in="" -case "${suite}" in - intrepid|jaunty|karmic) kernel_list="";; - hardy|lucid) kernel_list_in="kernels-pv-grub-hd0-V1.01.txt";; - maverick|natty) kernel_list_in="kernels-pv-grub-hd0-V1.01.txt";; - oneiric|precise|quantal) kernel_list_in="kernels-pv-grub-hd0-V1.02.txt";; - *) kernel_list_in="kernels-pv-grub-hd0-V1.03.txt";; -esac +# Amazon has asked that we use the lastest PVGRUB +# in all builds. +kernel_list_in="kernels-pv-grub-hd0.txt" if [ -n "${kernel_list_in}" ]; then findfile "${kernel_list_in}" "${fullzero%/*}" || + echo '' + echo '====== live-build [/tmp/live-build] ======' ====== live-build [/tmp/live-build] ====== + cd /tmp/live-build + bzr info Standalone tree (format: 1.9-rich-root) Location: branch root: . Related branches: parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/live-build/cloud-images/ + bzr version-info revision-id: ben.howard@canonical.com-20130118173449-3qca5w3nem83i4w4 date: 2013-01-18 10:34:49 -0700 build-date: 2013-01-24 07:04:21 +0000 revno: 1857 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1857 committer: Ben Howard branch nick: live-build timestamp: Fri 2013-01-18 10:34:49 -0700 message: Removing zerofree requirement for building raw hdds diff: === modified file 'scripts/build/lb_binary_virtual-hdd-raw' --- scripts/build/lb_binary_virtual-hdd-raw 2013-01-18 16:18:34 +0000 +++ scripts/build/lb_binary_virtual-hdd-raw 2013-01-18 17:34:49 +0000 @@ -48,7 +48,6 @@ case "${LB_BINARY_FILESYSTEM}" in ext2|ext3|ext4) Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs - Check_package chroot/usr/sbin/zerofree zerofree ;; esac fi + echo '' + echo '====== vmbuilder-0.11 [/tmp/vmbuilder-0.11] ======' ====== vmbuilder-0.11 [/tmp/vmbuilder-0.11] ====== + cd /tmp/vmbuilder-0.11 + bzr info Standalone tree (format: 2a) Location: branch root: . Related branches: parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/0.11a/ + bzr version-info revision-id: ben.howard@canonical.com-20120605221454-crv9cc4612f907lh date: 2012-06-05 16:14:54 -0600 build-date: 2013-01-24 07:04:22 +0000 revno: 398 branch-nick: vmbuilder-0.11 + bzr log -p -r-1 ------------------------------------------------------------ revno: 398 committer: Ben Howard branch nick: vmbuilder timestamp: Tue 2012-06-05 16:14:54 -0600 message: Fix for allow vmbuilder to run on 12.04 LTS. diff: === modified file 'VMBuilder/plugins/ubuntu/dapper.py' --- VMBuilder/plugins/ubuntu/dapper.py 2011-05-18 20:49:25 +0000 +++ VMBuilder/plugins/ubuntu/dapper.py 2012-06-05 22:14:54 +0000 @@ -157,18 +157,15 @@ self.vm.addpkg += ['openssh-server'] def mount_dev_proc(self): - run_cmd('mount', '--bind', '/dev', '%s/dev' % self.destdir) - self.vm.add_clean_cmd('umount', '%s/dev' % self.destdir, ignore_fail=True) - - run_cmd('mount', '--bind', '/dev/pts', '%s/dev/pts' % self.destdir) + run_cmd('mkdir', '-p', '%s/dev/pts' % self.destdir) + run_cmd('mount', '-t', 'devpts', 'devpts-live', '%s/dev/pts' % self.destdir) self.vm.add_clean_cmd('umount', '%s/dev/pts' % self.destdir, ignore_fail=True) - self.run_in_target('mount', '-t', 'proc', 'proc', '/proc') + run_cmd('mount', '-t', 'proc', 'proc-live', '%s/proc' % self.destdir) self.vm.add_clean_cmd('umount', '%s/proc' % self.destdir, ignore_fail=True) def unmount_dev_proc(self): run_cmd('umount', '%s/dev/pts' % self.destdir) - run_cmd('umount', '%s/dev' % self.destdir) run_cmd('sh', '-c', 'grep -q "$1" /proc/mounts || exit 0; umount "$1"', 'umount_binfmt', "%s/proc/sys/fs/binfmt_misc" % self.destdir) run_cmd('umount', '%s/proc' % self.destdir) + echo ''