+ 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-20130514223752-wi6kjugzxpfyyh2y
date: 2013-05-14 16:37:52 -0600
build-date: 2013-05-16 07:04:19 +0000
revno: 538
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 538
committer: Ben Howard <ben.howard@canonical.com>
branch nick: automated-ec2-builds
timestamp: Tue 2013-05-14 16:37:52 -0600
message:
  Fix for LP: 1179940: Don't modify /etc/default/grub for Quantal and later
diff:
=== modified file 'vmbuilder-cloudimg-fixes'
--- vmbuilder-cloudimg-fixes	2013-01-29 15:11:25 +0000
+++ vmbuilder-cloudimg-fixes	2013-05-14 22:37:52 +0000
@@ -216,49 +216,66 @@
    psuedo_grub_probe > "${gprobe}"
    chmod 755 "${gprobe}"
 
-   # modify default linux command line for serial console output
-   # change GRUB_CMDLINE_LINUX_DEFAULT="quite splash"
-   # to GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0"
-   opt="GRUB_CMDLINE_LINUX_DEFAULT"
-   defstr="console=ttyS0"
    if dist_ge "${codename}" quantal; then
-      defstr="console=tty1 console=ttyS0" # LP: #1016695
-   fi
-   sed -i "s/\(${opt}=\".*\"\)$/${opt}=\"${defstr}\"/" \
-      "${rootd}/etc/default/grub"
-
-   # make the debconf values match those stored in /etc/default/grub
-   # above.  This means that the user isn't prompted for a merge on
-   # a dpkg-reconfigure grub-pc
-   printf "%s\t%s\t%s\t%s\n%s\t%s\t%s\t%s\n" \
-      grub-pc grub2/linux_cmdline_default string "${defstr}" \
-      grub-pc grub2/linux_cmdline string " " |
-      _xchroot "${rootd}" debconf-set-selections
-
-   if dist_ge "${codename}" natty; then
+      # for Quantal and later, use /etc/default/grub.d functionality
+      # rather than modifying the grub configuration itself.
+      # This avoids the mess of having to do dpkg stuff
+      # LP: 1179940
+      mkdir -p "${rootd}/etc/default/grub.d"
+      cat << EOF > "${rootd}/etc/default/grub.d/50-cloudimg-settings.cfg"
+# Cloud Image specific Grub settings for Generic Cloud Images
+#  These settings are set by the Cloud Image build process
+
+# Set the recordfail timeout
+GRUB_RECORDFAIL_TIMEOUT=0
+
+# Do not wait on grub prompt
+GRUB_TIMEOUT=0
+
+# Set the default commandline
+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
+
+# Set the grub console type
+GRUB_TERMINAL=console
+EOF
+      _xchroot "${rootd}" update-grub2
+
+   else
+
+      if dist_ge "${codename}" oneiric; then
+         # on precise or later, do not hang at grub prompt after incomplete boot.
+         # This requires a grub feature also. (LP: #1035279, LP: #669481)
+         printf "\n%s\n%s\n" "#Disable recordfail timeout" \
+            "GRUB_RECORDFAIL_TIMEOUT=0" >> "${rootd}/etc/default/grub"
+      fi
+
+      # Set the grub time out
+      new_timeout=5
+      sed -i -e "s,^GRUB_TIMEOUT=.*,GRUB_TIMEOUT=${new_timeout}," \
+          "${rootd}/etc/default/grub"
+
+      # modify default linux command line for serial console output
+      # change GRUB_CMDLINE_LINUX_DEFAULT="quite splash"
+      # to GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0"
+      opt="GRUB_CMDLINE_LINUX_DEFAULT"
+      defstr="console=ttyS0"
+      sed -i "s/\(${opt}=\".*\"\)$/${opt}=\"${defstr}\"/" \
+         "${rootd}/etc/default/grub"
+
+      # make the debconf values match those stored in /etc/default/grub
+      # above.  This means that the user isn't prompted for a merge on
+      # a dpkg-reconfigure grub-pc
+      printf "%s\t%s\t%s\t%s\n%s\t%s\t%s\t%s\n" \
+         grub-pc grub2/linux_cmdline_default string "${defstr}" \
+         grub-pc grub2/linux_cmdline string " " |
+            _xchroot "${rootd}" debconf-set-selections
+
       sed -i -e 's,^\(GRUB_HIDDEN_TIMEOUT=.*\),#\1,' \
          -e 's/^\(GRUB_HIDDEN_TIMEOUT_QUIET=.*\)/#\1/' \
          -e 's,^#GRUB_TERMINAL=console,GRUB_TERMINAL=console,' \
          "${rootd}/etc/default/grub"
    fi
 
-   # on natty or later, modify/shorten GRUB_TIMEOUT
-   if dist_ge "${codename}" natty; then
-      new_timeout=5
-      # quantal removes the timeout entirely
-      dist_ge "$codename" quantal && new_timeout=0
-
-      sed -i -e "s,^GRUB_TIMEOUT=.*,GRUB_TIMEOUT=${new_timeout}," \
-          "${rootd}/etc/default/grub"
-   fi
-
-   # 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}" oneiric; then
-      printf "\n%s\n%s\n" "#Disable recordfail timeout" \
-         "GRUB_RECORDFAIL_TIMEOUT=0" >> "${rootd}/etc/default/grub"
-   fi
-
    _xchroot "${rootd}" /bin/sh -c \
       'grub-install --grub-setup=/bin/true /dev/sda && /usr/sbin/update-grub'
+ 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-20130510230229-tcgs1udfchge1chw
date: 2013-05-10 16:02:29 -0700
build-date: 2013-05-16 07:04:19 +0000
revno: 504
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 504
committer: Ben Howard <ben.howard@canonical.com>
branch nick: ec2-publishing-scripts
timestamp: Fri 2013-05-10 16:02:29 -0700
message:
  Fix failure caused by missing images being on S3
diff:
=== modified file 'publicize-clean'
--- publicize-clean	2012-03-28 17:21:36 +0000
+++ publicize-clean	2013-05-10 23:02:29 +0000
@@ -63,7 +63,8 @@
 
 		# make sure images weren't moved to S3
         rpath=${cpath//server\//}
-        ( curl -s -I http://cloud-images-archive.ubuntu.com/${rpath} | grep "HTTP/1.1 200 OK" > /dev/null ) && continue
+        ( curl -s -I http://cloud-images-archive.ubuntu.com/${rpath} | egrep "HTTP.*200 OK|HTTP.*302 Moved Temporarily" ) &&
+			continue
 
 		# otherwise images are local
 		dstr="\|${csuite}\t${cbname}\t${clabel}\t${cserial}"
+ 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-20130307184550-sfuml0svxs4x8kyy
date: 2013-03-07 11:45:50 -0700
build-date: 2013-05-16 07:04:20 +0000
revno: 1860
branch-nick: live-build
+ bzr log -p -r-1
------------------------------------------------------------
revno: 1860
committer: Ben Howard <ben.howard@canonical.com>
branch nick: live-build
timestamp: Thu 2013-03-07 11:45:50 -0700
message:
  Use dpkg-divert for upstart and start-stop-daemon (LP: #1150737)
diff:
=== modified file 'scripts/build/lb_chroot_dpkg'
--- scripts/build/lb_chroot_dpkg	2011-11-28 17:56:01 +0000
+++ scripts/build/lb_chroot_dpkg	2013-03-07 18:45:50 +0000
@@ -41,10 +41,9 @@
 		Create_lockfile .lock
 
 		# Save start-stop-daemon program
-		mv chroot/sbin/start-stop-daemon chroot/sbin/start-stop-daemon.orig
+		Chroot chroot dpkg-divert --quiet --rename --add /sbin/start-stop-daemon
 
 		# Create start-stop-daemon program
-
 cat > chroot/sbin/start-stop-daemon << EOF
 #!/bin/sh
 
@@ -103,10 +102,16 @@
 			rmdir --ignore-fail-on-non-empty /var/state/samhain || true
 		fi
 
-		# Restore start-stop-daemon program
-		if [ -e chroot/sbin/start-stop-daemon.orig ]
-		then
-			mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
+		# Delete the fake start-stop-daemon
+		if [ -e chroot/sbin/start-stop-daemon ]
+		then
+			rm chroot/sbin/start-stop-daemon
+		fi
+
+		# Restore the originial dpkg diversion
+		if [ -e chroot/sbin/start-stop-daemon.distrib ]
+		then
+			Chroot chroot dpkg-divert --quiet --rename --remove /sbin/start-stop-daemon
 		fi
 
 		# Remove dpkg sync configuration

=== modified file 'scripts/build/lb_chroot_upstart'
--- scripts/build/lb_chroot_upstart	2011-11-28 17:56:01 +0000
+++ scripts/build/lb_chroot_upstart	2013-03-07 18:45:50 +0000
@@ -42,8 +42,8 @@
 
 		if [ -f chroot/sbin/initctl ]
 		then
-			# Save initctl file
-			mv chroot/sbin/initctl chroot/sbin/initctl.orig
+            # Divert to allow for upgrades
+            Chroot chroot dpkg-divert --quiet --rename --add /sbin/initctl
 		fi
 
 		# Create initctl file
@@ -68,13 +68,14 @@
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/sbin/initctl.orig ]
+		if [ -e chroot/sbin/initctl ]; then
+			rm -f chroot/sbin/initctl
+		fi
+
+		if [ -f chroot/sbin/initctl.distrib ]
 		then
 			# Restore initctl file
-			mv chroot/sbin/initctl.orig chroot/sbin/initctl
-		else
-			# Remove initctl file
-			rm -f chroot/sbin/initctl
+		 	Chroot chroot dpkg-divert --quiet --rename --remove /sbin/initctl
 		fi
 
 		# Removing stage file
+ 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-05-16 07:04:20 +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 ''