+ 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: robert.jennings@canonical.com-20150818113224-u0rh4mofywc0n5hr
date: 2015-08-18 06:32:24 -0500
build-date: 2015-08-19 01:33:37 +0000
revno: 700
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 700
committer: Robert Jennings <robert.jennings@canonical.com>
branch nick: automated-ec2-builds
timestamp: Tue 2015-08-18 06:32:24 -0500
message:
  Workaround: Remove grub menu.lst for ucf registry (LP: #1485685)
  
  Users are still requiring manual intervention for upgrades that
  affect grub due to a failure to purge the ucf registry entry.
  
  At the root of this issue is ucf. The ucfr command will store a 
  path that contains symlinks during insertion but will only match the 
  symlink-resolved path when attempting removal. Cloud image builds modify
  grub's menu.lst but have attempted to purge the ufc registry entry. This
  bug in ucf causes the registry removal to fail.
  
  This was partially fixed upstream in 3.0028[1] so that future additions 
  to the registry would be symlink-resolved as well; however it does 
  not address upgrade such that the user still can not remove an entry
  containing a symlink.
  
  For our current cloud image users, we can ensure the entry is properly 
  removed during image creation for new images, ideally with a fixed ucf 
  package that benefits everyone, but for images in the field the user
  would need to remove the registry entry[2] and this is a manual edit of
  the registry file without further patches to upstream ucf.
  
  For this patch we remove the entry using sed rather than ucfr is
  updated from upstream.
  
  [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724457
  [2] sed -i -r "/grub[[:space:]]+\/var\/run\/grub\/menu\.lst/d" \
      /var/lib/ucf/registry
diff:
=== modified file 'vmbuilder-cloudimg-fixes'
--- vmbuilder-cloudimg-fixes	2015-03-10 13:53:36 +0000
+++ vmbuilder-cloudimg-fixes	2015-08-18 11:32:24 +0000
@@ -418,7 +418,14 @@
    # grub-legacy-ec2 writes this ucf entry. since we've modified
    # /boot/grub/menu.lst, we have to remove it, or the user will
    # get prompted for a 3 way merge of the changes the first time this runs
+   echo "ucf prior to grub removal contains:"
+   _xchroot "${rootd}" /bin/cat /var/lib/ucf/registry
    _xchroot "${rootd}" /usr/bin/ucfr --purge grub /var/run/grub/menu.lst
+   _xchroot "${rootd}" /bin/sed -i -r \
+      '/grub[[:space:]]+\/var\/run\/grub\/menu.lst/d' \
+      /var/lib/ucf/registry
+   echo "ucf registry now contains:"
+   _xchroot "${rootd}" /bin/cat /var/lib/ucf/registry
 fi
 
 if [ "${codename}" = "hardy" -o "${codename}" = "karmic" ] &&
+ 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-20150625133126-ur89sa2oafpi98g3
date: 2015-06-25 07:31:26 -0600
build-date: 2015-08-19 01:33:38 +0000
revno: 623
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 623
committer: Ben Howard <ben.howard@canonical.com>
branch nick: ec2-publishing-scripts
timestamp: Thu 2015-06-25 07:31:26 -0600
message:
  Fix publication path for HWE.
diff:
=== modified file 'publicize-build'
--- publicize-build	2015-06-25 03:26:16 +0000
+++ publicize-build	2015-06-25 13:31:26 +0000
@@ -110,7 +110,7 @@
 
 	# for HWE publications, they are appended to the backend
 	if [[ "${bname}" =~ hwe ]]; then
-		path="${path}/${bname%%-hwe*}"
+		path="${path}/${bname##server-}"
 	fi
 
 	local pad_ec2_arches=" ${ec2_arches} "
+ 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: 2015-08-19 01:33:38 +0000
revno: 1884
branch-nick: live-build
+ bzr log -p -r-1
------------------------------------------------------------
revno: 1884
committer: Ben Howard <ben.howard@canonical.com>
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: 2015-08-19 01:33:39 +0000
revno: 398
branch-nick: vmbuilder-0.11
+ bzr log -p -r-1
------------------------------------------------------------
revno: 398
committer: Ben Howard <ben.howard@canonical.com>
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 ''