+ 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-20140410180902-31ochjndh005sspj
date: 2014-04-10 12:09:02 -0600
build-date: 2014-04-16 19:08:53 +0000
revno: 624
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 624
committer: Ben Howard <ben.howard@canonical.com>
branch nick: automated-ec2-builds
timestamp: Thu 2014-04-10 12:09:02 -0600
message:
  Removed network definition from vcloud OVF
diff:
=== modified file 'ovf/conf/ubuntu-ovf-vcloud-vmdk.tmpl'
--- ovf/conf/ubuntu-ovf-vcloud-vmdk.tmpl	2014-04-03 18:43:10 +0000
+++ ovf/conf/ubuntu-ovf-vcloud-vmdk.tmpl	2014-04-10 18:09:02 +0000
@@ -4,12 +4,6 @@
     <ovf:References>
         <ovf:File ovf:href="$FILE_DISK_HREF" ovf:id="file1" ovf:size="$FILE_DISK_SIZE" />
     </ovf:References>
-    <ovf:NetworkSection>
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="Network">
-            <ovf:Description/>
-        </ovf:Network>
-    </ovf:NetworkSection>
     <ovf:DiskSection>
         <ovf:Info>Virtual disk information</ovf:Info>
         <ovf:Disk ovf:capacity="$DISK_CAPACITY" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize=""/>
@@ -30,19 +24,6 @@
                 <vssd:VirtualSystemType>vmx-09</vssd:VirtualSystemType>
             </ovf:System>
             <ovf:Item>
-                <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-                <rasd:Connection vcloud:ipAddress="" vcloud:ipAddressingMode="" vcloud:primaryNetworkConnection="true">Network</rasd:Connection>
-                <rasd:Description>E1000 Ethernet Adapter</rasd:Description>
-                <rasd:ElementName>Network adapter 0</rasd:ElementName>
-                <rasd:InstanceID>1</rasd:InstanceID>
-                <rasd:ResourceSubType>E1000</rasd:ResourceSubType>
-                <rasd:ResourceType>10</rasd:ResourceType>
-                <vmw:Config ovf:required="false" vmw:key="slotInfo.pciSlotNumber" vmw:value="33"/>
-                <vmw:Config ovf:required="false" vmw:key="wakeOnLanEnabled" vmw:value="true"/>
-            </ovf:Item>
-
-            <ovf:Item>
                 <rasd:Address>0</rasd:Address>
                 <rasd:Description>SCSI Controller</rasd:Description>
                 <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
+ 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@ubuntu.com-20140415164135-72kl8tup27z636uy
date: 2014-04-15 10:41:35 -0600
build-date: 2014-04-16 19:08:54 +0000
revno: 542
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 542
committer: Ben Howard <ben.howard@ubuntu.com>
branch nick: trunk
timestamp: Tue 2014-04-15 10:41:35 -0600
message:
  Removed comment on sriov registration; confirmed it works as desired
diff:
=== modified file 'publish-hvm-image'
--- publish-hvm-image	2014-04-11 19:25:26 +0000
+++ publish-hvm-image	2014-04-15 16:41:35 +0000
@@ -455,10 +455,7 @@
 					{ error "failed to migrate to ${region}"; exit 1; }
 		fi
 		junk="" img_id="" sriov_args="";
-		[ "${sriov:-0}" -eq 1 ] && {
-			debug 1 "image will be registered with --sriov=simple";
-			sriov_args="--sriov=simple";
-		}
+		[ "${sriov:-0}" -eq 1 ] && sriov_args="--sriov=simple";
 		run "${wdir}" "register.${region}" "register ${bucket}/${manifest_path}" \
 			xc2 register --region "${region}" \
 				--architecture "${arch}" --virtualization-type=hvm \
+ 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-20140331230745-0qe08186ylyg1pkr
date: 2014-03-31 17:07:45 -0600
build-date: 2014-04-16 19:08:54 +0000
revno: 1874
branch-nick: live-build
+ bzr log -p -r-1
------------------------------------------------------------
revno: 1874 [merge]
committer: Ben Howard <ben.howard@canonical.com>
branch nick: live-build
timestamp: Mon 2014-03-31 17:07:45 -0600
message:
  Mount dev to work with Trusty PPC64EL images
diff:
=== modified file 'scripts/build/lb_chroot_devpts'
--- scripts/build/lb_chroot_devpts	2011-11-28 17:56:01 +0000
+++ scripts/build/lb_chroot_devpts	2014-03-31 22:21:42 +0000
@@ -43,6 +43,8 @@
 		# Creating lock file
 		Create_lockfile .lock
 
+		${LB_ROOT_COMMAND} mount devtmpfs -t devtmpfs chroot/dev
+
 		if [ "${LB_USE_FAKEROOT}" != "true" ]
 		then
 			# Creating mountpoint
@@ -76,6 +78,8 @@
 			fi
 		fi
 
+		${LB_ROOT_COMMAND} umount chroot/dev || true
+
 		# Removing stage file
 		rm -f .stage/chroot_devpts
 		;;
------------------------------------------------------------
Use --include-merged or -n0 to see merged revisions.
+ 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: 2014-04-16 19:08:55 +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 ''