Changeset 2457 in MondoRescue

Timestamp:

Oct 9, 2009, 1:33:44 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Apply path from Matthew Cline (matt_at_nightrealms.com) in order to fix #359

File:

• branches/2.2.9/mindi/mindi (modified) (3 diffs)

branches/2.2.9/mindi/mindi

@@ -97 +97 @@
 ISO_CMD="/usr/bin/mkisofs"
 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
+
+# Mandriva system e.g. use cdrkit, which uses genisoimage instead of mkisofs.
+# However, they use exactly the same command line parameters, so just
+# use genisoimage if it's available.
+if [ ! -x $ISO_CMD ]; then
+    ISO_CMD=/usr/bin/genisoimage
+fi
 
 # Now we can create what we need
@@ -1334 +1341 @@
 OfferToMakeBootableISO() {
     local i old_pwd
+    if [ -z "$ISO_CMD" ]; then
+        LogIt "Neither mkisofs nor genisoimage found, unable to make CD image"
+        return
+    fi
     if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
         echo -en "Shall I make a bootable CD image? (y/[n]) "
@@ -2669 +2680 @@
 fi
 
+# Check for ISO_CMD command
+if [ ! -x $ISO_CMD ]; then
+    echo "NOTE: No CD image (ISO file) utility found" >> $LOGFILE
+fi
+
 FLOPPY_WAS_MOUNTED=""
 for mtpt in /media/floppy /mnt/floppy /floppy ; do