Author: gjb
Date: Sun Jun 21 04:34:57 2015
New Revision: 284660
URL: https://svnweb.freebsd.org/changeset/base/284660
Log:
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
Modified:
head/release/tools/azure.conf
Modified: head/release/tools/azure.conf
==============================================================================
--- head/release/tools/azure.conf Sun Jun 21 02:55:25 2015
(r284659)
+++ head/release/tools/azure.conf Sun Jun 21 04:34:57 2015
(r284660)
@@ -14,6 +14,7 @@ export VM_EXTRA_PACKAGES="sysutils/azure
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
-}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
