+ 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-20131122150746-jb058cci68g98xva
date: 2013-11-22 08:07:46 -0700
build-date: 2013-12-05 07:04:02 +0000
revno: 557
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 557
committer: Ben Howard <ben.howard@canonical.com>
branch nick: automated-ec2-builds
timestamp: Fri 2013-11-22 08:07:46 -0700
message:
  Removed Juju ad from images
diff:
=== modified file 'vmbuilder-cloudimg-fixes'
--- vmbuilder-cloudimg-fixes	2013-09-27 18:25:49 +0000
+++ vmbuilder-cloudimg-fixes	2013-11-22 15:07:46 +0000
@@ -88,14 +88,6 @@
 echo "    http://www.ubuntu.com/business/services/cloud"
 EOF
 
-if dist_ge "${codename}" precise; then
-   cat >> "${rootd}/etc/update-motd.d/51-cloudguest" << EOF
-echo ""
-echo "  Use Juju to deploy your cloud instances and workloads:"
-echo "    https://juju.ubuntu.com/#cloud-${codename}"
-EOF
-fi
-
 chmod +x "${rootd}/etc/update-motd.d/51-cloudguest"
 
 #### END COMMON ARCH FUNCTIONS
+ 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-20131203213059-4xjo40ptjcqwi3mb
date: 2013-12-03 14:30:59 -0700
build-date: 2013-12-05 07:04:02 +0000
revno: 508
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 508
committer: Ben Howard <ben.howard@canonical.com>
branch nick: ec2-publishing-scripts
timestamp: Tue 2013-12-03 14:30:59 -0700
message:
  Fixed sriov argument
diff:
=== modified file 'publish-build-ebs'
--- publish-build-ebs	2013-12-03 21:25:03 +0000
+++ publish-build-ebs	2013-12-03 21:30:59 +0000
@@ -197,7 +197,7 @@
 			# 2x845G instance-store disks.  cc2.8xlarge would get 4.
 			args=( "${args[@]}" 
 			       --virtualization-type=hvm
-			       "--sriov simple"
+			       --sriov simple
 			       --block-device-mapping /dev/sdb=ephemeral0
 			       --block-device-mapping /dev/sdc=ephemeral1 )
 			;;
+ 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-12-05 07:04:02 +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-12-05 07:04:03 +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 ''