aboutsummaryrefslogtreecommitdiff
path: root/release/tools/azure.conf
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-06-21 04:34:57 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-06-21 04:34:57 +0000
commit798e3ec5026002ecef8ac720c62f17cfe1199f93 (patch)
tree06ce408da1f27fa93b044466755bbe984a174bd1 /release/tools/azure.conf
parent186d96ca888d147989b3b206b4d403c2928c0dbe (diff)
downloadsrc-798e3ec5026002ecef8ac720c62f17cfe1199f93.tar.gz
src-798e3ec5026002ecef8ac720c62f17cfe1199f93.zip
Chase r284656 and r284658:
Remove the Azure-local vm_extra_create_disk(), since we no longer need qemu-img to convert the final VHD image to an Azure-compatible format. Although the waagent utility is installed from ports, create the symlink to /usr/sbin, pending investigation on where this is hard-coded, so it can be reported upstream. In the meantime, this is good enough. MFC after: 3 days X-MFC-Needs: r284269, r284270, r284271, r284655, r284656, r284657, r284658, r284659 X-MFC-Note: Required for 10.2-RELEASE, marcel@ has implicit approval for the required changes Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=284660
Diffstat (limited to 'release/tools/azure.conf')
-rw-r--r--release/tools/azure.conf15
1 files changed, 1 insertions, 14 deletions
diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 4267f9797734..60076984b1bd 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -14,6 +14,7 @@ export VM_EXTRA_PACKAGES="sysutils/azure-agent"
export VM_RC_LIST=
vm_extra_pre_umount() {
+ chroot ${DESTDIR} ln -s /usr/local/sbin/waagent /usr/sbin/waagent
chroot ${DESTDIR} /usr/local/sbin/waagent -verbose -install
yes | chroot ${DESTDIR} /usr/local/sbin/waagent -deprovision
echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
@@ -26,17 +27,3 @@ vm_extra_pre_umount() {
return 0
}
-
-vm_extra_create_disk() {
- if [ ! -x "/usr/local/bin/qemu-img" ]; then
- env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-devel
- fi
-
- mv ${VMIMAGE} ${VMIMAGE}.raw
- size=$(qemu-img info -f raw --output json ${VMIMAGE}.raw | awk '/virtual-size/ {print $2}' | tr -d ',')
- size=$(( ( ${size} / ( 1024 * 1024 ) + 1 ) * ( 1024 * 1024 ) ))
- qemu-img resize ${VMIMAGE}.raw ${size}
- qemu-img convert -f raw -o subformat=fixed -O vpc ${VMIMAGE}.raw ${VMIMAGE}
-
- return 0
-}