From a6de7b0fbf2c242edef607d0f861cda7577109be Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 27 Jan 2015 21:53:31 +0100 Subject: [PATCH] temp version that at least fixes a serious regression in previous revision --- build.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 343100b..bfec840 100755 --- a/build.sh +++ b/build.sh @@ -230,19 +230,23 @@ function build_overlay () { BUILDTMP=$(mktemp -d ${BUILDTMP}/bootcd.XXXXXX) push_cleanup rm -fr "${BUILDTMP}" - mkdir "${BUILDTMP}/isofs" + + # initialize ISOFS + ISOFS="${BUILDTMP}/isofs" + mkdir -p "$ISOFS" for i in "$ISOREF"/isofs/{bootcd.img,kernel}; do - ln -s "$i" "${BUILDTMP}/isofs" + ln -s "$i" "$ISOFS" done # use new location as of fedora 12 # used to be in /usr/lib/syslinux/isolinux.bin # removed backward compat in jan. 2015 - official=/usr/share/syslinux/isolinux.bin - [ -f $official ] && cp $official "${BUILDTMP}/isofs" - # as of syslinux 5.0 (fedora 21) this file is required as well - official=/usr/share/syslinux/ldlinux.c32 - [ -f $official ] && cp $official "${BUILDTMP}/isofs" - ISOFS="${BUILDTMP}/isofs" + # as of syslinux 5.0 (fedora 21) ldlinux.c32 is required by isolinux.bin + # the debug version can come in handy at times, and is 40k as well + isolinuxdir="/usr/share/syslinux" + isolinuxfiles="isolinux.bin ldlinux.c32 isolinux-debug.bin" + for isolinuxfile in $isolinuxfiles; do + [ -f $isolinuxdir/$isolinuxfile ] && cp $isolinuxdir/$isolinuxfile "${BUILDTMP}/isofs" + done # Root of the ISO and USB images echo "* Populating root filesystem..." -- 2.43.0