From owner-svn-src-projects@FreeBSD.ORG  Sun Sep 28 20:06:03 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 75420576;
 Sun, 28 Sep 2014 20:06:03 +0000 (UTC)
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 6247AF1A;
 Sun, 28 Sep 2014 20:06:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8SK63Uh035051;
 Sun, 28 Sep 2014 20:06:03 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8SK62qJ035049;
 Sun, 28 Sep 2014 20:06:02 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201409282006.s8SK62qJ035049@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: Sun, 28 Sep 2014 20:06:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272269 - in projects/release-vmimage/release: . scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Sep 2014 20:06:03 -0000

Author: gjb
Date: Sun Sep 28 20:06:02 2014
New Revision: 272269
URL: http://svnweb.freebsd.org/changeset/base/272269

Log:
  release/Makefile:
    Include .OBJDIR in DESTDIR in the vm-base target.
  
  release/release.sh:
    Provide the full path to mddev.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/Makefile
  projects/release-vmimage/release/scripts/mk-vmimage.sh

Modified: projects/release-vmimage/release/Makefile
==============================================================================
--- projects/release-vmimage/release/Makefile	Sun Sep 28 19:55:21 2014	(r272268)
+++ projects/release-vmimage/release/Makefile	Sun Sep 28 20:06:02 2014	(r272269)
@@ -318,7 +318,8 @@ install:
 vm-base:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 	env IMAKE=${IMAKE} WORLDDIR=${WORLDDIR} \
-		VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} DESTDIR=${.TARGET} \
+		VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} \
+		DESTDIR=${.OBJDIR}/${.TARGET} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET}
 .endif

Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/scripts/mk-vmimage.sh	Sun Sep 28 19:55:21 2014	(r272268)
+++ projects/release-vmimage/release/scripts/mk-vmimage.sh	Sun Sep 28 20:06:02 2014	(r272269)
@@ -64,7 +64,7 @@ vm_create_baseimage() {
 	truncate -s ${VMSIZE} ${VMBASE}
 	mddev=$(mdconfig -f ${VMBASE})
 	newfs -L root -j ${mddev}
-	mount ${mddev} ${DESTDIR}
+	mount /dev/${mddev} ${DESTDIR}
 	cd ${WORLDDIR} && \
 		${IMAKE} DESTDIR=${DESTDIR} \
 		installworld installkernel distribution || \