+ 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-20130212141737-rtmvnem3ws4ioy9j date: 2013-02-12 09:17:37 -0500 build-date: 2013-02-22 14:05:37 +0000 revno: 532 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 532 committer: Scott Moser branch nick: trunk timestamp: Tue 2013-02-12 09:17:37 -0500 message: uecify-hardy: be tolerant of missing /etc/resolv.conf the released hardy images 20121003 do not have a resolv.conf file in them, so the 'mv' was failing. This is probably a regression in the build process as a result of some of the resolvconf handling. Previously in hardy images there would probably have been a resolv.conf copied from the build host. diff: === modified file 'uecify-hardy' --- uecify-hardy 2012-04-30 23:31:09 +0000 +++ uecify-hardy 2013-02-12 14:17:37 +0000 @@ -70,9 +70,11 @@ mount --bind "${d}" "${MP}/${d}" || fail "failed to bind-mount ${d}" done -mv "${MP}/etc/resolv.conf" "${MP}/etc/resolv.conf.dist" && - cp /etc/resolv.conf "${MP}/etc/resolv.conf" || - fail "failed to update resolv.conf in image" +rconf="$MP/etc/resolv.conf" +if [ -e "$rconf" -o -L "$rconf" ]; then + mv "$rconf" "$rconf.dist" || fail "failed to backup resolv.conf" +fi +cp /etc/resolv.conf "$rconf" || fail "failed to update resolv.conf in image" # uses linux-server (versus linux-virtual) so that acpiphp.ko module # would be present. LP: #364916 @@ -142,8 +144,11 @@ cp "${MP}/boot/initrd.img-2.6"*-server "${ramdisk}" || fail "failed to copy out kernel/ramdisk" -mv "${MP}/etc/resolv.conf.dist" "${MP}/etc/resolv.conf" || - fail "failed to restore image resolv.conf" +rconf="$MP/etc/resolv.conf" +rm -f "$rconf" || fail "failed to remove resolv.conf" +if [ -e "$rconf.dist" -o -L "$rconf.dist" ]; then + mv "$rconf.dist" "$rconf" || fail "failed to restore resolv.conf" +fi unmount_dir "${MP}" && MP="" || fail "failed to unmount ${MP}" + 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-20130128213759-b9nvocpc2ikedbax date: 2013-01-28 14:37:59 -0700 build-date: 2013-02-22 14:05:38 +0000 revno: 500 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 500 committer: Ben Howard branch nick: ec2-publishing-scripts timestamp: Mon 2013-01-28 14:37:59 -0700 message: Error, not fail on snapshot deletion. Addresses wonky regions which prevent deletions diff: === modified file 'clean-unused-snapshots' --- clean-unused-snapshots 2012-08-28 21:55:26 +0000 +++ clean-unused-snapshots 2013-01-28 21:37:59 +0000 @@ -189,7 +189,7 @@ debugp 1 "deleting $snap [$ts $size $state $desc]\n" if [ $dry_run -eq 0 ]; then xc2 delete-snapshot --region "$region" "$snap" || - fail "failed to delete $snap in $region [$state $desc]" + error "failed to delete $snap in $region [$state $desc]" else error delete-snapshot --region "$region" "$snap" fi + 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-20130214233433-pto0805jnh5c8mqe date: 2013-02-14 16:34:33 -0700 build-date: 2013-02-22 14:05:38 +0000 revno: 1859 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1859 committer: Ben Howard branch nick: live-build timestamp: Thu 2013-02-14 16:34:33 -0700 message: Reverting prior change for 2TB disks diff: === modified file 'scripts/build/lb_binary_virtual-hdd-raw' --- scripts/build/lb_binary_virtual-hdd-raw 2013-02-14 22:50:47 +0000 +++ scripts/build/lb_binary_virtual-hdd-raw 2013-02-14 23:34:33 +0000 @@ -81,7 +81,7 @@ ext2|ext3|ext4) Echo_message "Creating virtual disk image..." Chroot chroot "dd if=/dev/zero of=binary-raw.img bs=1024k count=0 seek=${LB_HDD_SIZE}" - Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F /binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID} -E resize=536870912" + Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F /binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID}" ;; esac @@ -97,7 +97,7 @@ ext2|ext3|ext4) 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} -E resize=536870912 + ${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 \ + 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-02-22 14:05:38 +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 ''