From owner-svn-src-all@FreeBSD.ORG  Mon Jun 22 00:54:48 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@nevdull.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 90D296CB;
 Mon, 22 Jun 2015 00:54:48 +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 7EC34DC4;
 Mon, 22 Jun 2015 00:54:48 +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 t5M0smpw097159;
 Mon, 22 Jun 2015 00:54:48 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5M0smvC097158;
 Mon, 22 Jun 2015 00:54:48 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201506220054.t5M0smvC097158@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 22 Jun 2015 00:54:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284690 - stable/10/release/tools
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jun 2015 00:54:48 -0000

Author: gjb
Date: Mon Jun 22 00:54:47 2015
New Revision: 284690
URL: https://svnweb.freebsd.org/changeset/base/284690

Log:
  MFC r284617:
   Fix path to waagent.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/10/release/tools/azure.conf
==============================================================================
--- stable/10/release/tools/azure.conf	Mon Jun 22 00:34:29 2015	(r284689)
+++ stable/10/release/tools/azure.conf	Mon Jun 22 00:54:47 2015	(r284690)
@@ -14,8 +14,8 @@ export VM_EXTRA_PACKAGES="sysutils/azure
 export VM_RC_LIST=
 
 vm_extra_pre_umount() {
-	chroot ${DESTDIR} /usr/sbin/waagent -verbose -install
-	yes | chroot ${DESTDIR} /usr/sbin/waagent -deprovision
+	chroot ${DESTDIR} /usr/local/sbin/waagent -verbose -install
+	yes | chroot ${DESTDIR} /usr/local/sbin/waagent -deprovision
 	echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'ifconfig_hn0="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
 	echo 'waagent_enable="YES"' >> ${DESTDIR}/etc/rc.conf