aboutsummaryrefslogtreecommitdiff
path: root/release/tools/vmimage.subr
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-04-21 14:48:38 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-04-21 14:48:38 +0000
commitbf93ac7884ea3bb53b5c2d65f8d9df88fba6a6a2 (patch)
treeb1884851bfdfe39753ea0719055cd998d500a2bc /release/tools/vmimage.subr
parent6289b482ecc4dd757b61fe9f299696b7da000f4e (diff)
downloadsrc-bf93ac7884ea3bb53b5c2d65f8d9df88fba6a6a2.tar.gz
src-bf93ac7884ea3bb53b5c2d65f8d9df88fba6a6a2.zip
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
Notes
Notes: svn path=/head/; revision=281832
Diffstat (limited to 'release/tools/vmimage.subr')
-rw-r--r--release/tools/vmimage.subr8
1 files changed, 4 insertions, 4 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index d9c95c6f22aa..1a295e55519b 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