Changeset 3746 in MondoRescue for branches

Timestamp:

Nov 19, 2019, 1:25:56 PM (5 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)

Location:

branches/3.3

Files:

• mindi/mindi (modified) (3 diffs)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (4 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

branches/3.3/mondo/src/common/libmondo-archive.c

@@ -629 +629 @@
         }
         bootldr_ver = call_program_and_get_last_line_of_output("grub --version 2> /dev/null");
-        if (strcmp(bootldr_ver,"") ==0) {
+        if (strcmp(bootldr_ver,"") == 0) {
             mr_free(bootldr_ver);
             bootldr_ver = call_program_and_get_last_line_of_output("grub2-install --version");

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

@@ -2515 +2515 @@
             }
         }
+        /*  TODO: Useless I think */
         if (bkpinfo->disaster_recovery) {
             mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -9 +9 @@
 #include "mr_str.h"
 #include "mr_file.h"
+#include "mr_sys.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -1282 +1283 @@
   /** malloc *******/
     char *device = NULL;
+    char *disk = NULL;
     char *name = NULL;
+    char *type = NULL;
     char *cmd = NULL;
 
     malloc_string(device);
     malloc_string(name);
+    malloc_string(type);
 
     /* In order to have a working bootloader, we need to have all devices
@@ -1294 +1298 @@
     mr_asprintf(cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
     run_program_and_log_output(cmd, 3);
-    paranoid_free(cmd);
+    mr_free(cmd);
 
     backup_crucial_file(MNT_RESTORING, "/etc/fstab");
@@ -1307 +1311 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    log_msg(2, "run_boot_loader: device='%s', name='%s'", device, name);
+    read_cfg_var(g_mondo_cfg_file, "boot-type", type);
+    log_msg(2, "run_boot_loader: device='%s', name='%s', type='%s'", device, name, type);
     sync();
 
     offer_to_make_initrd();
+
+    disk = truncate_to_drive_name(device);
+    if (strcmp(type,"BIOS") == 0) {
+        // Force installation of a MBR bootloader brought by mindi on the disk
+        // in case none was available and we then start from a partition
+        log_msg(2, "Reinstalling mbr.bin on %s", disk);
+        mr_system("dd bs=440 count=1 conv=notrunc if=/tmp/mbr.bin of=%s &> /dev/null",disk);
+    } else {
+        // Same for GPT
+        log_msg(2, "Reinstalling gptmbr.bin on %s", disk);
+        mr_system("dd bs=440 count=1 conv=notrunc if=/tmp/gptmbr.bin of=%s &> /dev/null",disk);
+    }
+
+    // Now reinstall bootloader
     if (!strcmp(name, "LILO")) {
         res = run_lilo(offer_to_hack_scripts);