Changeset 3429 in MondoRescue

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

Location:

branches/3.2

Files:

• mindi/mindi (modified) (3 diffs)
• mondo-doc/mondoarchive.8 (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/mondostructures.h (modified) (1 diff)
• mondo/src/restore-scripts/mondo/grub-MR (modified) (1 diff)

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`

branches/3.2/mondo-doc/mondoarchive.8

@@ -359 +359 @@
 .TP
 .BI "\-l " "GRUB|LILO|ELILO|RAW"
-Specify the boot loader. By default, your Master Boot Record is examined and
+Specify the boot loader. By default, your environment is examined and
 the boot loader can usually be discovered. If you specify RAW then the MBR will
 be backed up and restored byte-for-byte without any analysis. It is likely that
 you will also need to specify the boot device with \-f <dev>. ELILO is mandatory
-for IA64 machines.
+for IA64 machines. GRUB is mandatory for now for UEFI systems.
 
 .TP

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -400 +400 @@
 
 /**
- * Determine whether given NULL-terminated @p str exists in the MBR of @p dev.
+ * Determine whether given NULL-terminated @p str exists in the begining of @p dev.
  * @param dev The device to look in.
  * @param str The string to look for.

branches/3.2/mondo/src/common/mondostructures.h

@@ -207 +207 @@
     interactive,                    /// Interactive mode
     compare,                    /// Compare mode
-    mbr,                        /// MBR mode
+    mbr,                        /// MBR restore only
     isoonly,                    /// ISO mode
     isonuke,                    /// ISO+Nuke mode

branches/3.2/mondo/src/restore-scripts/mondo/grub-MR

@@ -93 +93 @@
 
 if [ "$#" -ne "2" ] ; then
-    Die "grub-MR <MBR drive> <mountlist filename>; e.g. grub-MR /dev/hda /tmp/mountlist.txt"
+    Die "grub-MR <boot drive> <mountlist filename>; e.g. grub-MR /dev/hda /tmp/mountlist.txt"
 fi
 [ ! -f "$2" ] && Die "mountlist file not found"