+ 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-03-25 07:04:03 +0000
revno: 532
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 532
committer: Scott Moser <smoser@ubuntu.com>
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-03-25 07:04:04 +0000
revno: 500
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 500
committer: Ben Howard <ben.howard@canonical.com>
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-20130307184550-sfuml0svxs4x8kyy
date: 2013-03-07 11:45:50 -0700
build-date: 2013-03-25 07:04:04 +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-03-25 07:04:05 +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 ''