Changeset 1535 in MondoRescue for branches/stable/mindi

Timestamp:

Jul 18, 2007, 6:18:02 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use the configuration files in mondo (begining). That revision doesn't even compile.

Location:

branches/stable/mindi

Files:

• distributions/conf/mindi.conf.dist (modified) (1 diff)
• mindi (modified) (3 diffs)

branches/stable/mindi/distributions/conf/mindi.conf.dist

@@ -170 +170 @@
 "
 
+#
+# Options common between mindi and mondo are stored below
+#
+
+#
+# ISO image CLI command to use 
+# For mindi options are fixed and based on mkisofs options
+# Potentially overwritten by monoarchive values
+#
+mr_iso_creation_cmd="/usr/bin/mkisofs"
+#mindi_iso_creation_cmd="/usr/bin/growisofs"
+
+#
+# ISO image common creation options (for mkisofs/growisofs/wodim)
+# do not specify the -o, -c or the -b options, nor the directory to backup
+# as they will be generated by mondoarchive
+#
+mr_iso_creation_opt="-J -r -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue"
+#mr_iso_creation_options="-use-the-force-luke -v  -J -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue -V _CD#_"

branches/stable/mindi/mindi

@@ -109 +109 @@
 NET_MODS="$mindi_net_mods"
 EXTRA_MODS="$CDROM_MODS $mindi_extra_mods $mindi_additional_mods"
-DENY_MODS="mindi_deny_mods"
-FORCE_MODS="mindi_force_mods"
+DENY_MODS="$mindi_deny_mods"
+FORCE_MODS="$mindi_force_mods"
+ISO_CMD="$mr_iso_creation_cmd"
+ISO_OPT="$mr_iso_creation_opt"
 
 BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
@@ -1617 +1619 @@
             cp -f $MONDO_SHARE/autorun . 2>> $LOGFILE
         fi
-        mkisofs -U -J -r -o $MINDI_CACHE/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
-    else
-        mkisofs -J -r -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
+        $ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
+    else
+        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     fi
     if [ "$?" -ne "0" ] ; then
-        echo "----------- mkisofs's errors --------------" >> $LOGFILE
+        echo "----------- $ISO_CMD's errors --------------" >> $LOGFILE
         cat $MINDI_TMP/mkisofs.log >> $LOGFILE
-        echo "mkisofs returned the following errors:-"
+        echo "$ISO_CMD returned the following errors:-"
         cat $MINDI_TMP/mkisofs.log
         LogIt "Failed to create ISO image."
@@ -2907 +2909 @@
     shift
     if [ _"$1" != _"" ] ; then
-        set | egrep "^$1" | cut -d= -f2
+        set | grep -Ew "^$1" | cut -d= -f2
     fi
     MindiExit 0