svn commit: r284774 - in stable/10/release: . tools

[Glen Barber]

Author: gjb
Date: Wed Jun 24 18:56:28 2015
New Revision: 284774
URL: https://svnweb.freebsd.org/changeset/base/284774

Log:
  MFC r284660, r284676:
  
   r284660:
    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.
  
   r284676:
    Append the hour and minute to the snapshot suffix for EC2
    AMIs and Azure VM images.  This is particularly helpful for
    testing to avoid name collisions, but also useful for cases
    where a necessary rebuild is done before the date changes.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile.azure
  stable/10/release/Makefile.ec2
  stable/10/release/tools/azure.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile.azure
==============================================================================
--- stable/10/release/Makefile.azure	Wed Jun 24 18:40:34 2015	(r284773)
+++ stable/10/release/Makefile.azure	Wed Jun 24 18:56:28 2015	(r284774)
@@ -17,7 +17,7 @@ AZURE${VAR}!=	grep -E ^AZURE${VAR} ${AZU
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
-SNAPSHOT_DATE!=		date +-%Y-%m-%d
+SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H:%M
 .endif
 
 AZURE_TARGET:=		${OSRELEASE}${SNAPSHOT_DATE}.vhd

Modified: stable/10/release/Makefile.ec2
==============================================================================
--- stable/10/release/Makefile.ec2	Wed Jun 24 18:40:34 2015	(r284773)
+++ stable/10/release/Makefile.ec2	Wed Jun 24 18:56:28 2015	(r284774)
@@ -6,7 +6,7 @@
 #
 
 .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
-AMINAMESUFFIX!=	date +-%Y-%m-%d
+AMINAMESUFFIX!=	date +-%Y-%m-%d-%H:%M
 .endif
 .if defined(EC2PUBLIC)
 PUBLISH=	--public

Modified: stable/10/release/tools/azure.conf
==============================================================================
--- stable/10/release/tools/azure.conf	Wed Jun 24 18:40:34 2015	(r284773)
+++ stable/10/release/tools/azure.conf	Wed Jun 24 18:56:28 2015	(r284774)
@@ -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
-}