Changeset 3746 in MondoRescue for branches/3.3/mindi/mindi

Timestamp:

Nov 19, 2019, 1:25:56 PM (4 years ago)

Author:

Bruno Cornec

Message:

Reinstall mbr.bin (or pgtmbr.bin) from syslinux before calling boot loader restoration to avoid having nothing if we boot from a partition
(tested with SLES 12)

File:

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

branches/3.3/mindi/mindi

@@ -134 +134 @@
 if [ -d "/sys/firmware/efi" ]; then
     BOOT_TYPE="UEFI"
-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
+fi
+
+# Find MBR file in case of bootable USB device to build and for restoring it
+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
+
+# Find GPTMBR in case of bootable USB device to build and for restoring it
+GPTMBRFILE=/usr/lib/syslinux/gptmbr.bin
+[ ! -r "$GPTMBRFILE" ] && GPTMBRFILE=/usr/lib64/syslinux/gptmbr.bin
+[ ! -r "$GPTMBRFILE" ] && GPTMBRFILE=/usr/share/syslinux/gptmbr.bin
+[ ! -r "$GPTMBRFILE" ] && GPTMBRFILE=/usr/share/lib/syslinux/gptmbr.bin
+[ ! -r "$GPTMBRFILE" ] && GPTMBRFILE=/usr/share/lib64/syslinux/gptmbr.bin
 
 # Function to log on screen only
@@ -2439 +2446 @@
             cp -pRdf $MINDI_TMP/$q $bigdir/tmp 2>> $LOGFILE
         done
+        for q in $MBRFILE $GPTMBRFILE; do
+            if [ -r $q ]; then
+                cp -a $q $bigdir/tmp 2>> $LOGFILE
+            else
+                LogFile "Unable to copy $q to bigdir. May be unable to restore MBR"
+            fi
+        done
     fi
 
@@ -3370 +3384 @@
 $FDISK -l >> $LOGFILE
 LogFile "----------------"
+LogFile "MBRFILE = $MBRFILE"
+LogFile "GPTMBRFILE = $GPTMBRFILE"
 
 # Compute libata version