From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 04:34:58 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6C5C785; Sun, 21 Jun 2015 04:34:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CE642B2; Sun, 21 Jun 2015 04:34:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L4Yw1a090414; Sun, 21 Jun 2015 04:34:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L4YwRm090413; Sun, 21 Jun 2015 04:34:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506210434.t5L4YwRm090413@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 21 Jun 2015 04:34:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284660 - head/release/tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 04:34:58 -0000 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 -}