From bf93ac7884ea3bb53b5c2d65f8d9df88fba6a6a2 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 21 Apr 2015 14:48:38 +0000
Subject: [PATCH] Revert r281809, which did more harm than good, and apply a
 more proper fix when attempting to locate the /boot files.

Sponsored by:	The FreeBSD Foundation
---
 release/tools/vmimage.subr | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index d9c95c6f22a..1a295e55519 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -14,11 +14,11 @@ write_partition_layout() {
 		SWAPOPT="-p freebsd-swap/swapfs::1G"
 	fi
 
-	_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR | tr -d '/usr/src')"
-	if [ -d "${_OBJDIR}/${TARGET}.${TARGET_ARCH}" ]; then
-		BOOTFILES="${_OBJDIR}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
+	_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)"
+	if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then
+		BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
 	else
-		BOOTFILES="${_OBJDIR}/usr/src/sys/boot"
+		BOOTFILES="/${_OBJDIR}/sys/boot"
 	fi
 
 	case "${TARGET}:${TARGET_ARCH}" in