svn commit: r281832 - head/release/tools

[Glen Barber]

Author: gjb
Date: Tue Apr 21 14:48:38 2015
New Revision: 281832
URL: https://svnweb.freebsd.org/changeset/base/281832

Log:
  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

Modified:
  head/release/tools/vmimage.subr

Modified: head/release/tools/vmimage.subr
==============================================================================
--- head/release/tools/vmimage.subr	Tue Apr 21 14:48:18 2015	(r281831)
+++ head/release/tools/vmimage.subr	Tue Apr 21 14:48:38 2015	(r281832)
@@ -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