mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-25 11:37:56 +00:00
Code Issues Releases Activity

Chase r284656 and r284658:

Browse Source 
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
This commit is contained in:
Glen Barber 2015-06-21 04:34:57 +00:00
parent 186d96ca88
commit 798e3ec502
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=284660
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
release/tools/azure.conf
View File

@ -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
}