d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r281809, which did more harm than good, and apply

Browse Source 
a more proper fix when attempting to locate the /boot
files.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-04-21 14:48:38 +00:00
parent 6289b482ec
commit bf93ac7884
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/tools/vmimage.subr
View File

@ -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