Changeset 3535 in MondoRescue for branches/3.2/mindi/mindi

Timestamp:

Mar 21, 2016, 4:54:33 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Standardize output for keyboard detection with other INFO: msgs
• Fix the creation of the bootable ISO for UEFI mode (needs kernel and initrd at the root with EFI and images for the boot and restore part) which can be created without making a FS for it BTW.
• Fix the creation of the grub2 conf file for UEFI mode using linuxefi and initrdefi orders
• Adds supoprt for kernel later than 3.x up to 9.x

File:

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

branches/3.2/mindi/mindi

@@ -271 +271 @@
             return
         fi
-    else
-        echo -en "`basename $mappath | tr '.' '#' | sed 's/#kmap#gz//' | sed 's/#inc#gz//'` " | tr '#' '.'
     fi
 
@@ -286 +284 @@
             [ "$sss" = "" ] && sss=`grep -F "$included_item" $MINDI_TMP/keymaps.find`
             for ii in $sss ; do
-                [ -e "$ii" ] && AddKeyboardMappingFile $ii
+                    [ -e "$ii" ] && AddKeyboardMappingFile $ii
             done
         else
@@ -500 +498 @@
         return
     fi
-    LogAll "INFO: Adding the following keyboard mapping tables: "
+    echo -en "INFO: Adding keyboard mapping tables"
     mkdir -p $bigdir/tmp
     echo "keymap-lives-here $mappath" >> $bigdir/tmp/$MRCFG
@@ -1474 +1472 @@
 MakeISO() {
 
-LogAll "INFO: Invoking $CMD"
+LogAll "INFO: Invoking $CMD ."
 (cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
 if [ $? -ne 0 ] ; then
@@ -1785 +1783 @@
     cp $part $MINDI_CACHE
     if [ "$ARCH" = "ia64" ] || [ "$BOOT_TYPE" = "UEFI" ]; then
-        # Here we need to remount to put the boot image at the right place now it's available
-        mount -t vfat $mount_opt $part $MINDI_TMP/mpt 2>> $LOGFILE
-        # We don't need the previous content used to make it, free space
-        rm -rf $MINDI_TMP/mpt/{EFI,initrd.img,vmlinuz,images/all.tar.gz}
-        # We need the boot image now
-        cp $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt/images
+        # We just need the EFI dir and the boot image for this case
+        mkdir -p $MINDI_TMP/mpt2 $MINDI_TMP/mpt/images
+        mount -o loop $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt2 2>> $LOGFILE
+        # We need again the kernel+initrd at the root for UEFI boot at least
+        cp -a $MINDI_TMP/mpt2/EFI $MINDI_TMP/mpt2/vmlinuz $MINDI_TMP/mpt2/initrd.img $MINDI_TMP/mpt
+        # We need the boot image now and what mindi needs at restore time as well
+        cp -a $MINDI_TMP/mpt2/images/all.tar.gz $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt/images
+        umount $MINDI_TMP/mpt2
+        LogFile "----------- target dir content -----------"
+        LogFile "------------------------------------------"
+        ls -lR $MINDI_TMP/mpt >> $LOGFILE
+        LogFile "------------------------------------------"
         MakeISO
-        umount $MINDI_TMP/mpt || Die "Unable to unmount $MINDI_TMP/mpt"
     fi
 else
@@ -1946 +1949 @@
         echo -en "set "
     else
+        # syslinux family
         echo -en "prompt 1\ndisplay message.txt\nF1 message.txt\nF2 boot1.txt\nF3 boot2.txt\nF4 pxe.txt\n"
     fi
@@ -2012 +2016 @@
             outstr="title $i\n\tkernel /vmlinuz root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n\tinitrd=/initrd.img\n"
         elif [ "$type" = "grub2" ]; then
-            outstr="menuentry '$i' {\n\tinsmod all_video\n\tinsmod gzio\n\tinsmod part_msdos\n\tinsmod part_gpt\n\tinsmod ext2\n\tinsmod xfs\n\techo 'Loading kernel...'\n\tlinux /vmlinuz root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n\techo 'Loading ramdisk...'\n\tinitrd /initrd.img\n}\n"
+            if [ "$BOOT_TYPE" = "UEFI" ]; then
+                lorder="linuxefi"
+                iorder="initrdefi"
+            else
+                lorder="linux"
+                iorder="initrd"
+            fi
+            outstr="menuentry '$i' {\n\tinsmod all_video\n\tinsmod gzio\n\tinsmod part_msdos\n\tinsmod part_gpt\n\tinsmod ext2\n\tinsmod xfs\n\techo 'Loading kernel...'\n\t$lorder /vmlinuz root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n\techo 'Loading ramdisk...'\n\t$iorder /initrd.img\n}\n"
         else
             ps="/"
@@ -2426 +2437 @@
     done
     if [ ! "$possible_kernels" ] && uname -a | grep Knoppix > /dev/null ; then
-        possible_kernels=`find /boot/vmlinuz-[23].* | tail -n1`
+        possible_kernels=`find /boot/vmlinuz-[2-9].* | tail -n1`
     fi
     if [ ! "$possible_kernels" ] ; then