X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=bfec84071f785af71ea4bbe7636587cf3d617da5;hb=a6de7b0fbf2c242edef607d0f861cda7577109be;hp=5dc111c33bcfc8747be38f05b5c85fcdeb39045f;hpb=417568827a6a6eaf1df70d3f2dc0cd7d8a35bd7b;p=bootcd.git

diff --git a/build.sh b/build.sh
index 5dc111c..bfec840 100755
--- a/build.sh
+++ b/build.sh
@@ -13,8 +13,8 @@ DIRNAME=$(dirname $0)
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 DEBUG_SYSTEMD=""
-# temporary
-DEBUG_SYSTEMD=true
+# uncomment this on to get systemd's full log on console (slows things down)
+#DEBUG_SYSTEMD=true
 
 # defaults
 DEFAULT_TYPES="usb iso"
@@ -230,14 +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
+    # 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
-    # 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" 
-    ISOFS="${BUILDTMP}/isofs"
 
     # Root of the ISO and USB images
     echo "* Populating root filesystem..."
@@ -387,7 +396,7 @@ TIMEOUT 40
 EOF
 
     # Create ISO image
-    echo "* Creating ISO image"
+    echo "* Creating ISO image in $(pwd)"
     mkisofs -o "$iso" $MKISOFS_OPTS $ISOFS
 }