Changeset 2944 in MondoRescue for branches/3.0/mondo/src

Timestamp:

Feb 3, 2012, 2:12:47 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds grub2 support (Michael Caerwyn mcaerwyn_at_gmail.com)

Location:

branches/3.0/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• restore-scripts/mondo/grub-MR (modified) (1 diff)
• restore-scripts/mondo/stabgrub-me (modified) (4 diffs)

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

@@ -701 +701 @@
                 ("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
         }
-        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg"))) {
+        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
             fatal_error
-                ("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst or /boot/grub/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
+                ("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
     } else if (bkpinfo->boot_loader == 'E') {

branches/3.0/mondo/src/common/libmondo-mountlist.c

@@ -949 +949 @@
     }
     paranoid_fclose(fout);
+    if (!(fout = fopen(MONDO_MNTLISTCHG, "w"))) {
+        log_OS_error("WMTD - Cannot openout "MONDO_MNTLISTCHG);
+        return (1);
+    }
+    fprintf(fout, "the mountlist was changed by mondorestore\n");
+    paranoid_fclose(fout);
     return (0);
 }

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

@@ -1301 +1301 @@
     backup_crucial_file(MNT_RESTORING, "/boot/grub/menu.lst");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/grub.cfg");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/grub.cfg");
     backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
     backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/device.map");
     backup_crucial_file(MNT_RESTORING, "/etc/mtab");
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
@@ -1456 +1458 @@
                 } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
                     sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
                 }
                 paranoid_system(tmp);
-                sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
+                                }
                 paranoid_system(tmp);
                 if (!g_text_mode) {

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

@@ -133 +133 @@
 [ "$res" -eq "0" ] && exit 0
 
+
+echo "Now I'll use grub2-install" >> $LOGFILE
+if [ "$MNT_RESTORING" ] ; then
+    chroot $MNT_RESTORING grub2-install $1 >> $LOGFILE 2>> $LOGFILE
+    res=$?
+else
+    grub2-install $1 >> $LOGFILE 2>> $LOGFILE
+    res=$?
+fi
+echo "grub2-install returned $res" >> $LOGFILE
+[ "$res" -eq "0" ] && exit 0
+
 echo "Trying a hack" >> $LOGFILE
 FindBootPart $1 $2 2>&1 | tee -a $LOGFILE

branches/3.0/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -57 +57 @@
 LocateOldGrub() {
     old_grubconf=""
-    if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ] || [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ] ; then
+    if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ] || [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ] || [ -f "/mnt/RESTORING/boot/grub2/grub.cfg" ] ; then
         LogIt "No need for menu.lst/grub.cfg search." 2
         if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ]; then
@@ -63 +63 @@
         elif [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ]; then
             old_grubconf=/mnt/RESTORING/boot/grub/grub.cfg
+        elif [ -f "/mnt/RESTORING/boot/grub2/grub.cfg" ]; then
+            old_grubconf=/mnt/RESTORING/boot/grub2/grub.cfg
         fi
         if [ -L "$old_grubconf" ] ; then
@@ -68 +70 @@
             if [ _"`echo $l | cut -c1`" = _"/" ]; then
                 # If readlink gives an absolute path it's related to the chroot
-                old_grubconf=/mnt/RESTORING/$l
+                        old_grubconf=/mnt/RESTORING/$l
             else
                 # If readlink gives a relative path, it's in the same dir
-                old_grubconf=/mnt/RESTORING/boot/grub/$l
+                    d=`dirname "$old_grubconf"`
+                        old_grubconf=$d/$l
             fi
-        fi  
+        fi
         return 0
     fi
@@ -128 +131 @@
 elif [ -f /mnt/RESTORING/boot/grub/grub.cfg ]; then
     new_grubconf=/mnt/RESTORING/boot/grub/grub.cfg.NEW
+elif [ -f /mnt/RESTORING/boot/grub2/grub.cfg ]; then
+    new_grubconf=/mnt/RESTORING/boot/grub2/grub.cfg.NEW
 fi
 # change back to /tmp if /mnt/RESTORING/etc be problematic