Changeset 3493 in MondoRescue

Timestamp:

Jan 5, 2016, 1:25:29 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi to use a subdir called isolinux when using that bootloader with all related files in it and rename syslinux.cfg in to isolinux.cfg so that bootable mindi images now work again

File:

• branches/3.2/mindi/mindi (modified) (7 diffs)

branches/3.2/mindi/mindi

@@ -1499 +1499 @@
     cp $kernelpath $MINDI_TMP/iso/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/vmlinuz). Did you run out of disk space?"
     cp $MINDI_TMP/initrd.img $MINDI_TMP/iso/initrd.img 2>> $LOGFILE || Die "Cannot copy initrd.img ($MINDI_TMP/initrd.img) to $MINDI_TMP/iso/initrd.img. Did you run out of disk space?"
-    if [ "$ARCH" != "ia64" ] ; then
-        cp $ISOLINUX $MINDI_TMP/iso/isolinux.bin 2>> $LOGFILE || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso - did you run out of disk space?"
-    fi
 
     # copy boot stuff now generated in PrepareDataDiskImage
@@ -1511 +1508 @@
         tbc="boot"
     fi
+    if [ "$ARCH" != "ia64" ] ; then
+        cp $ISOLINUX $MINDI_TMP/iso/$tbc/isolinux.bin 2>> $LOGFILE || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso - did you run out of disk space?"
+    fi
 
     if [ _"$MONDO_SHARE" != _"" ]; then 
@@ -1528 +1528 @@
     cd "$MINDI_TMP/iso"
     if [ "$ARCH" != "ia64" ] ; then
+        cfgf=`find $MINDI_TMP/iso -name 'syslinux.cfg' | head -1`
+        cfgf2=`echo $cfgf | sed 's/syslinux.cfg/isolinux.cfg/'`
+        mv $cfgf $cfgf2
+        # For isolinux boot, name the directory correctly as well as the conf file
+        if [ -e "$MINDI_TMP/iso/boot" ]; then
+            mv $MINDI_TMP/iso/boot $MINDI_TMP/iso/isolinux
+            tbc="isolinux"
+        fi
         if [ _"$MONDO_SHARE" != _"" ]; then 
-            cp -rf $MINDI_TMP/iso/{initrd.img,vmlinuz,isolinux.bin,message.txt,boot*.txt,pxe.txt,$tbc} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
-            cfgf=`find $MINDI_TMP/iso -name 'isolinux.cfg' | head -1`
-            if [ -e "$cfgf" ]; then
-                cp $cfgf $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy $cfgf to $MONDO_ROOT. Did you run out of disk space?"
-            fi
+            cp -rf $MINDI_TMP/iso/{initrd.img,vmlinuz,message.txt,boot*.txt,pxe.txt,$tbc} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
             if [ $KERNEL_IS_XEN = "yes" ]; then
                 cp -f $MINDI_TMP/iso/xen.gz $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy Xen kernel to $MONDO_ROOT. Did you run out of disk space?"
@@ -1539 +1543 @@
             cp -f $MONDO_SHARE/autorun $MINDI_TMP/iso 2>> $LOGFILE
         fi
-        CMD="$ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
+        CMD="$ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b $tbc/isolinux.bin -c $tbc/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
     else
         CMD="$ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.img -c images/boot.cat -no-emul-boot"
@@ -2578 +2582 @@
         fi
     done
+    LogAll "Processing all dependencies of required files..."
     for f in `cat $MINDI_TMP/minimal.lis` `sort -u $MINDI_TMP/minimal2.lis`; do
         mr-read-all-link $f >> $MINDI_TMP/minimal.lis
@@ -2707 +2712 @@
 
     # Management of perl scripts delivered needed at restore time
-    LogIt "INFO: Analyzing perl modules dependencies"
+    LogAll "Analyzing perl modules dependencies..."
     mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` /usr/[s]*bin/mr-* 2> $templog > $MINDI_TMP/perl.lis || LogIt "ERROR: Problem in mindi-get-perl-modules" $templog
     LogFile "DBG4: Perl Modules found:"
@@ -2745 +2750 @@
 
     [ -e "$needed_modules_path" ] || LogIt "WARNING: path $needed_modules_path does not exist.\n         If you're not using a modular kernel then mindi won't probably work."
+    LogAll "Analyzing kernel modules dependencies..."
     needed_modules=`mr-kernel-get-modules $mkgmopt $list_of_groovy_mods`