Changeset 3518 in MondoRescue for branches/3.2

Timestamp:

Feb 22, 2016, 1:36:08 AM (8 years ago)

Author:

Bruno Cornec

Message:

• mindi now generates a grub2 compliant conf file (not tested yet)

File:

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

branches/3.2/mindi/mindi

@@ -1819 +1819 @@
     elif [ "$type" = "grub" ]; then
         echo -en "pause Press a key when ready to restore\n"
+    elif [ "$type" = "grub2" ]; then
+        echo -en "set "
     else
         echo -en "prompt 1\ndisplay message.txt\nF1 message.txt\nF2 boot1.txt\nF3 boot2.txt\nF4 pxe.txt\n"
@@ -1856 +1858 @@
 
     # Handle timeout
+    if [ "$type" = "grub" ]; then
+        sep='='
+    fi
     if [ "$CDRECOVERY" != "yes" ] ; then
         echo -en "timeout${sep}${MINDI_BOOT_TIMEOUT}\n"
@@ -1882 +1887 @@
         elif [ "$type" = "grub" ]; then
             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"
         else
             ps="/"
@@ -1898 +1905 @@
         elif [ "$type" = "grub" ]; then
             echo -en "title memtest\n\tkernel /memtest.efi\n\tinitrd=/memtest.img\n"
+        elif [ "$type" = "grub2" ]; then
+            echo -en "menuentry 'memtest' {\n\tload_video\n\tinsmod gzio\n\tinsmod part_msdos\n\tinsmod xfs\n\tlinux /memtest\n\tinitrd /memtest.img\n}\n"
         else
             ps="/"
@@ -2179 +2188 @@
                 bootbin=`find /boot/efi -iname "grub*.efi" | head -1`
                 bootconf="$efidir/grub.conf"
+                boottype=grub2
+            elif [ $dname = "debian" ] && [ $dver = "8" ]; then
+                bootbin=`find /boot/efi -iname "grub*.efi" | head -1`
+                bootconf="$efidir/grub.cfg"
                 boottype=grub2
             else
@@ -3238 +3251 @@
         mr-read-all-link $2
         MindiExit $?
+    elif [ "$1" = "--makebcf" ] ; then
+            [ ! "$2" ] && Die "Please specify the boot mode to check (BIOS,UEFI, EFI)"
+        MakeBootConfFile $2
     elif [ "$1" = "--makemessage" ] ; then
         MakeMessageFile | cut -c1-80