From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 27 Jan 2015 09:37:46 +0000 (+0100)
Subject: fedora21 comes with syslinux v6 which requires ldlinux.c32 in addition to its new... 
X-Git-Tag: bootcd-5.2-5~26
X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=6cc43daf4c98f8a92313de03685e4e2a1b5e5533

fedora21 comes with syslinux v6 which requires ldlinux.c32 in addition to its new isolinux.bin

in the process, drop support for an old location of isolinux.bin (pre-f12)
---

diff --git a/build.sh b/build.sh
index 16adabd..343100b 100755
--- a/build.sh
+++ b/build.sh
@@ -234,9 +234,14 @@ function build_overlay () {
     for i in "$ISOREF"/isofs/{bootcd.img,kernel}; do
 	ln -s "$i" "${BUILDTMP}/isofs"
     done
-    # the syslinux that comes with f12 has this file in a new location
-    cp "/usr/lib/syslinux/isolinux.bin" "${BUILDTMP}/isofs" \
-	|| cp "/usr/share/syslinux/isolinux.bin" "${BUILDTMP}/isofs" 
+    # 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"
 
     # Root of the ISO and USB images
@@ -387,7 +392,7 @@ TIMEOUT 40
 EOF
 
     # Create ISO image
-    echo "* Creating ISO image"
+    echo "* Creating ISO image in $(pwd)"
     mkisofs -o "$iso" $MKISOFS_OPTS $ISOFS
 }