+ 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-20190409174518-5q5ahde9exsnkrwm
date: 2019-04-09 12:45:18 -0500
build-date: 2019-05-14 22:23:35 +0000
revno: 738
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 738 [merge]
fixes bug: https://launchpad.net/bugs/1823776
committer: Robert C Jennings <robert.jennings@canonical.com>
branch nick: automated-ec2-builds
timestamp: Tue 2019-04-09 12:45:18 -0500
message:
  Merge lp:~ubuntu-on-ec2/vmbuilder/no-wrong-51-cloudguest into lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds [a=vorlon] [r=rcj,tobijk]
  
  /etc/update-motd.d/51-cloudguest contains information that is inconsistent
  with our current product offerings and we should make sure this gets nuked
  before we roll the last images for 14.04 before the transition to ESM
  
  MP: https://code.launchpad.net/~ubuntu-on-ec2/vmbuilder/no-wrong-51-cloudguest/+merge/365695
diff:
=== modified file 'vmbuilder-cloudimg-fixes'
--- vmbuilder-cloudimg-fixes	2015-08-18 11:32:24 +0000
+++ vmbuilder-cloudimg-fixes	2019-04-08 18:23:21 +0000
@@ -110,24 +110,6 @@
    sed -i "s,^[^#${bl}]*\([${bl}]*/[${bl}].*\),${lstr}\1," "${rootd}/etc/fstab"
 fi
 
-## Make sure that the update-motd.d directory exists
-[ ! -e "${rootd}/etc/update-motd.d" ] &&
-   mkdir -p "${rootd}/etc/update-motd.d"
-
-## write a MOTD file advertising support for images
-cat > "${rootd}/etc/update-motd.d/51-cloudguest" << EOF
-#!/bin/sh
-#
-${CLOUD_IMG_STR}
-# This file is not managed by a package.  If you no longer want to
-# see this message you can safely remove the file.
-echo ""
-echo "  Get cloud support with Ubuntu Advantage Cloud Guest:"
-echo "    http://www.ubuntu.com/business/services/cloud"
-EOF
-
-chmod +x "${rootd}/etc/update-motd.d/51-cloudguest"
-
 # for quantal and newer, add /etc/overlayroot.local.conf
 # but do not overwrite anything that somehow got there
 if dist_ge "${codename}" "quantal" &&
------------------------------------------------------------
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: tobias.koch@canonical.com-20190424190158-i652gqap3pidottn
date: 2019-04-24 21:01:58 +0200
build-date: 2019-05-14 22:23:35 +0000
revno: 668
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 668 [merge]
committer: Tobias Koch <tobias.koch@canonical.com>
branch nick: ec2-publishing-scripts
timestamp: Wed 2019-04-24 21:01:58 +0200
message:
  Merge lp:~tobijk/ubuntu-on-ec2/ec2-publishing-scripts-eoan into lp:~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts [a=tobijk] [r=davidkrauser,rcj]
  
  Add eoan to ubuntu-adj2version
  
  MP: https://code.launchpad.net/~tobijk/ubuntu-on-ec2/ec2-publishing-scripts-eoan/+merge/366415
diff:
=== modified file 'ubuntu-adj2version'
--- ubuntu-adj2version	2018-11-12 12:28:06 +0000
+++ ubuntu-adj2version	2019-04-23 18:36:29 +0000
@@ -51,6 +51,7 @@
 		bionic) _RET="18.04" ;;
 		cosmic) _RET="18.10" ;;
 		disco) _RET="19.04" ;;
+		eoan) _RET="19.10" ;;
 		*) fail "Unknown suite $1" ;;
 	esac
 }
------------------------------------------------------------
Use --include-merged or -n0 to see merged revisions.
+ 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: 2019-05-14 22:23:35 +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: 2019-05-14 22:23:36 +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 ''