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

Timestamp:

Aug 27, 2015, 10:50:26 AM (9 years ago)

Author:

Bruno Cornec

Message:

( Only use MBR when dealing with a BIOS type of boot env

File:

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

branches/3.2/mindi/mindi

@@ -77 +77 @@
 # Force some modules to be included
 FORCE_MODS=""
-
-# Find MBR in case of bootable USB device to build
-MBRFILE=/usr/lib/syslinux/mbr.bin
-[ ! -r "$MBRFILE" ] && MBRFILE=/usr/lib64/syslinux/mbr.bin
-[ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/syslinux/mbr.bin
-[ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib/syslinux/mbr.bin
-[ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib64/syslinux/mbr.bin
 
 LOGFILE=/var/log/mindi.log
@@ -119 +112 @@
     BOOT_TYPE="UEFI"
     ISO_OPT="$ISO_OPT -eltorito-alt-boot -e images/mindi-bootroot.img -no-emul-boot"
+else
+    # Find MBR in case of bootable USB device to build
+    MBRFILE=/usr/lib/syslinux/mbr.bin
+    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/lib64/syslinux/mbr.bin
+    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/syslinux/mbr.bin
+    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib/syslinux/mbr.bin
+    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib64/syslinux/mbr.bin
 fi
 
@@ -2150 +2150 @@
     fi
 
-    #if [ "$BOOT_TYPE" = "UEFI" ] && [ -f "$lilodir/grub.conf" ]; then
-        # for grub 0.97 the conf file is not read with the grub.efi file :-( 
-        # Not very nice, but needed it seems
-        #LogFile "Copying grub.conf file as we use legacy grub on UEFI"
-        #mkdir -p $bootdir/boot/grub
-        #cp $lilodir/grub.conf $bootdir/boot/grub
-    #fi
-
     echo -en "Tarring and zipping the data content..."
     size_of_all_tools=`du -sk $bigdir | cut -f1`