From f54137c33145752ab340a21d34d1a9df3389df35 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 28 Sep 2014 20:06:02 +0000
Subject: [PATCH] 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
---
 release/Makefile              | 3 ++-
 release/scripts/mk-vmimage.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index ade92ff92aa3..7fdea8521d3f 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -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
diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index 884c5a571cf0..d33b4c0e4a79 100755
--- a/release/scripts/mk-vmimage.sh
+++ b/release/scripts/mk-vmimage.sh
@@ -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 || \