+ 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@ubuntu.com-20150409185947-3ote4e96udzwj95b date: 2015-04-09 12:59:47 -0600 build-date: 2015-04-17 02:32:38 +0000 revno: 667 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 667 committer: Ben Howard branch nick: master timestamp: Thu 2015-04-09 12:59:47 -0600 message: Set umask to 022 diff: === modified file 'build-ec2-image' --- build-ec2-image 2015-04-06 19:55:24 +0000 +++ build-ec2-image 2015-04-09 18:59:47 +0000 @@ -1,5 +1,6 @@ #!/bin/bash # vi: ts=4 noexpandtab +umask 022 cmd_args=$* base_d=$(dirname $(readlink -f "${0}")) @@ -462,11 +463,12 @@ "${cmd[@]}" || fail "failed to run ova_cmd: ${cmd[@]}" sudo chown -R "$(id -u):$(id -g)" "${ovf_d}" chmod go+r "${ovf_d}/"* + touch "${ovf_d}/"* fi # create OVF containers for disk_type in ${ovf_disks}; do - [ "${ovf_default:-vmdk}" = "${disk_type}" ] && + [ "${ovf_default:-vmdk}" = "${disk_type}" ] && prefix="${img_base}" || prefix="${img_base}-${disk_type}" disk_name="${img_base}-disk1.${disk_type}" @@ -487,6 +489,7 @@ "${cmd[@]}" || fail "failed to run ovf_cmd: ${cmd[@]}" sudo chown -R "$(id -u):$(id -g)" "${ovf_d}" chmod go+r "${ovf_d}/"* + touch "${ovf_d}/"* done [ "${raw_disk:-0}" -ne 0 ] || { [ -e "${disk_img}" ] && rm ${disk_img}; } === modified file 'cloudimg-build-launcher' --- cloudimg-build-launcher 2011-08-23 22:08:07 +0000 +++ cloudimg-build-launcher 2015-04-09 18:59:47 +0000 @@ -21,7 +21,7 @@ STD_OUT=1 STD_ERR=2 -umask ug+w +umask 022 Usage() { cat < branch nick: trunk timestamp: Thu 2015-04-16 17:17:34 +0100 message: Don't unset EBS_SKIP_ARCH. diff: === modified file 'publish-build-ebs' --- publish-build-ebs 2015-04-16 10:46:00 +0000 +++ publish-build-ebs 2015-04-16 16:17:34 +0000 @@ -59,7 +59,6 @@ TERMINATE="" TMPD="" -EBS_SKIP_ARCH= ITEMS_EBS="i386:ebs amd64:ebs i386:ebs-io1 amd64:ebs-io1 i386:ebs-ssd amd64:ebs-ssd" ITEMS_HVM="amd64:hvm amd64:hvm-io1 amd64:hvm-ssd" ITEMS_EBS="${OVERRIDE_ITEMS_EBS:-$ITEMS_EBS}" + 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-20141208180246-js9ir7isckza6dli date: 2014-12-08 11:02:46 -0700 build-date: 2015-04-17 02:32:39 +0000 revno: 1881 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1881 committer: Ben Howard branch nick: live-build timestamp: Mon 2014-12-08 11:02:46 -0700 message: Allow for 2TB resizes diff: === modified file 'scripts/build/lb_binary_virtual-hdd-raw' --- scripts/build/lb_binary_virtual-hdd-raw 2014-02-25 20:46:27 +0000 +++ scripts/build/lb_binary_virtual-hdd-raw 2014-12-08 18:02:46 +0000 @@ -81,7 +81,7 @@ ext2|ext3|ext4) Echo_message "Creating virtual disk image..." Chroot chroot "dd if=/dev/zero of=binary-raw.img bs=1024k count=0 seek=${LB_HDD_SIZE}" - Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F /binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID}" + Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F /binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID} -E resize=536870912" ;; esac @@ -97,7 +97,7 @@ ext2|ext3|ext4) Echo_message "Creating virtual filesystem...(created outside chroot)" dd if=/dev/zero of=binary-raw.img bs=1024k count=0 seek=${LB_HDD_SIZE} - ${LB_ROOT_COMMAND} mkfs.${LB_BINARY_FILESYSTEM} -F binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID} + ${LB_ROOT_COMMAND} mkfs.${LB_BINARY_FILESYSTEM} -F binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID} -E resize=536870912 ${LB_ROOT_COMMAND} mount -o loop binary-raw.img binary-raw.tmp rsync -aXHAS \ --one-file-system \ + 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: 2015-04-17 02:32:40 +0000 revno: 398 branch-nick: vmbuilder-0.11 + bzr log -p -r-1 ------------------------------------------------------------ revno: 398 committer: Ben Howard 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 ''