+ 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: smoser@ubuntu.com-20121106182359-7wgerqo9pjlqozby date: 2012-11-06 13:23:59 -0500 build-date: 2012-12-18 00:18:15 +0000 revno: 526 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 526 fixes bug: https://launchpad.net/bugs/1035279 committer: Scott Moser branch nick: trunk timestamp: Tue 2012-11-06 13:23:59 -0500 message: adding oneiric to the list of images that get this fix (LP: #1035279) diff: === modified file 'vmbuilder-cloudimg-fixes' --- vmbuilder-cloudimg-fixes 2012-11-06 18:21:33 +0000 +++ vmbuilder-cloudimg-fixes 2012-11-06 18:23:59 +0000 @@ -244,7 +244,7 @@ # on precise or later, do not hang at grub prompt after incomplete boot. # This requires a grub feature also. (LP: #1035279, LP: #669481) - if dist_ge "${codename}" precise; then + if dist_ge "${codename}" oneiric; then printf "\n%s\n%s\n" "#Disable recordfail timeout" \ "GRUB_RECORDFAIL_TIMEOUT=0" >> "${rootd}/etc/default/grub" fi + 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-20121112233352-ux26vf1gnrqln9xi date: 2012-11-12 16:33:52 -0700 build-date: 2012-12-18 00:18:15 +0000 revno: 493 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 493 committer: Ben Howard branch nick: ec2-publishing-scripts timestamp: Mon 2012-11-12 16:33:52 -0700 message: Adding AP-SE-2 EBS worker AMI diff: === modified file 'publish-build-ebs' --- publish-build-ebs 2012-08-23 14:08:02 +0000 +++ publish-build-ebs 2012-11-12 23:33:52 +0000 @@ -11,8 +11,8 @@ PUBLISH_BUCKET=${PUBLISH_BUCKET:-"ubuntu-data"} AMI_REGIONS=( $(ec2-list-all-regions) ) # these are lucid 20110930, in order of output of ec2-list-all-regions -# US-West-1 US-West-2 US-East-1 EU-West-1 AP-SE-1 AP-NE-1 SA-East-1 -DEF_AMI_IDS="ami-ed227ea8 ami-34f67b04 ami-1136fb78 ami-ee0e3c9a ami-e0205ab2 ami-58b40059 ami-c43ae5d9" +# US-West-1 US-West-2 US-East-1 EU-West-1 AP-SE-1 AP-NE-1 SA-East-1 AP-SE-2 +DEF_AMI_IDS="ami-ed227ea8 ami-34f67b04 ami-1136fb78 ami-ee0e3c9a ami-e0205ab2 ami-58b40059 ami-c43ae5d9 ami-9b8611a1" AMI_IDS=( ${EBS_UTIL_AMIS:-${DEF_AMI_IDS}} ) # for builds that should be published to hvm (--publish-hvm) + 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-20121025025438-sjc5p8r097uwj83h date: 2012-10-25 04:54:38 +0200 build-date: 2012-12-18 00:18:16 +0000 revno: 1855 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1855 committer: Ben Howard branch nick: live-build timestamp: Thu 2012-10-25 04:54:38 +0200 message: Fix for missing required LXC tree diff: === modified file 'scripts/build/lb_binary_virtual-hdd-raw' --- scripts/build/lb_binary_virtual-hdd-raw 2012-06-11 17:24:38 +0000 +++ scripts/build/lb_binary_virtual-hdd-raw 2012-10-25 02:54:38 +0000 @@ -95,11 +95,32 @@ else case "${LB_BINARY_FILESYSTEM}" in ext2|ext3|ext4) - Echo_message "Creating virtual filesystem..." + Echo_message "Creating virtual filesystem...(created outside chroot)" dd if=/dev/zero of=binary-raw.img bs=1024k count=0 seek=${LB_HDD_SIZE} ${LB_ROOT_COMMAND} mkfs.${LB_BINARY_FILESYSTEM} -F binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID} ${LB_ROOT_COMMAND} mount -o loop binary-raw.img binary-raw.tmp - rsync -aXHAS --one-file-system --sparse --exclude='/proc/*' --exclude="/sys/*" --exclude="/dev/*" chroot/* binary-raw.tmp/ 2> /dev/null + rsync -aXHAS \ + --one-file-system \ + --sparse \ + --exclude='/proc/*' \ + --exclude="/sys/*" \ + --exclude="/dev/*" \ + chroot/* binary-raw.tmp/ 2> /dev/null + + # Create bare LXC device tree + Echo_message "Populating virtual filesystem with bare dev tree" + mknod -m 666 binary-raw.tmp/null c 1 3 + mknod -m 666 binary-raw.tmp/zero c 1 5 + mknod -m 666 binary-raw.tmp/random c 1 8 + mknod -m 666 binary-raw.tmp/urandom c 1 9 + mkdir -m 755 binary-raw.tmp/pts + mkdir -m 1777 binary-raw.tmp/shm + mknod -m 666 binary-raw.tmp/tty c 5 0 + mknod -m 600 binary-raw.tmp/console c 5 1 + mknod -m 666 binary-raw.tmp/tty0 c 4 0 + mknod -m 666 binary-raw.tmp/full c 1 7 + mknod -m 600 binary-raw.tmp/initctl p + mknod -m 666 binary-raw.tmp/ptmx c 5 2 ;; 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: 2012-12-18 00:18:16 +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 ''