+ 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: phil.roche@canonical.com-20160523101909-v1lylfh17e71nfr3 date: 2016-05-23 11:19:09 +0100 build-date: 2016-06-10 16:00:19 +0000 revno: 724 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 724 [merge] committer: Phil Roche branch nick: automated-ec2-builds timestamp: Mon 2016-05-23 11:19:09 +0100 message: Removed HWCLOCKACCESS=no from /etc/default/rcS diff: === removed file 'live-config/common/hooks/051-hwclock.chroot' --- live-config/common/hooks/051-hwclock.chroot 2011-12-01 19:28:52 +0000 +++ live-config/common/hooks/051-hwclock.chroot 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -#!/bin/bash - -printf "HWCLOCKACCESS=no" >> /etc/default/rcS ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions. + 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: robert.jennings@canonical.com-20160527142536-3tha5e2ibwcoaiw5 date: 2016-05-27 09:25:36 -0500 build-date: 2016-06-10 16:00:20 +0000 revno: 644 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 644 committer: Robert C Jennings branch nick: ec2-publishing-scripts timestamp: Fri 2016-05-27 09:25:36 -0500 message: Append grub options as root Previously the script attempted to append to the grub config file as the current user. This patch changes this to properly use sudo. diff: === modified file 'ec2-image2ebs' --- ec2-image2ebs 2016-05-26 14:33:30 +0000 +++ ec2-image2ebs 2016-05-27 14:25:36 +0000 @@ -149,8 +149,9 @@ -e 's,^#GRUB_TERMINAL=console,GRUB_TERMINAL=console,' \ "${mnt}/etc/default/grub" if [ -f "${mnt}/etc/default/grub.d/50-cloudimg-settings.cfg" ] ; then - sudo echo GRUB_HIDDEN_TIMEOUT=0.1 >> \ - "${mnt}/etc/default/grub.d/50-cloudimg-settings.cfg" + echo GRUB_HIDDEN_TIMEOUT=0.1 | \ + sudo tee --append \ + "${mnt}/etc/default/grub.d/50-cloudimg-settings.cfg" > /dev/null fi for m in sys proc dev; do sudo mount --bind "/${m}" "${mnt}/${m}"; done sudo chroot "${mnt}" update-grub + 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-20150612123735-zf4q8vxmjb7vaq7w date: 2015-06-12 06:37:35 -0600 build-date: 2016-06-10 16:00:20 +0000 revno: 1884 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1884 committer: Ben Howard branch nick: live-build timestamp: Fri 2015-06-12 06:37:35 -0600 message: Drop kernel from ubuntu-cloud-t-hwe package list; use live build cli to configure diff: === modified file 'package-lists/ubuntu-cloud-t-hwe' --- package-lists/ubuntu-cloud-t-hwe 2015-06-11 22:55:21 +0000 +++ package-lists/ubuntu-cloud-t-hwe 2015-06-12 12:37:35 +0000 @@ -6,4 +6,4 @@ standard^ cloud-image^ # Packages -linux-image-virtual-lts-vivid landscape-client ubuntu-minimal +landscape-client ubuntu-minimal + 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: 2016-06-10 16:00:20 +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 ''