diff options
| author | gjb <gjb@FreeBSD.org> | 2015-04-21 14:48:38 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-04-21 14:48:38 +0000 |
| commit | 9c99303fe22d674e2def4eb6aaffec535c2e272c (patch) | |
| tree | b1884851bfdfe39753ea0719055cd998d500a2bc /release/tools | |
| parent | 598f70c8b4adff38f53a5a95888cc863bd35bab4 (diff) | |
| download | FreeBSD-src-9c99303fe22d674e2def4eb6aaffec535c2e272c.zip FreeBSD-src-9c99303fe22d674e2def4eb6aaffec535c2e272c.tar.gz | |
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
Diffstat (limited to 'release/tools')
| -rw-r--r-- | release/tools/vmimage.subr | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index d9c95c6..1a295e5 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 |
