Changeset 2449 in MondoRescue

Timestamp:

Oct 6, 2009, 1:10:35 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds support for grub2 conf file grub.cfg in addition to menu.lst

Location:

branches/2.2.9/mondo/src

Files:

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

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

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

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

@@ -1404 +1404 @@
     backup_crucial_file(MNT_RESTORING, "/etc/fstab");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/menu.lst");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub/grub.cfg");
     backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
     backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
@@ -1538 +1539 @@
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab, mtab, device.map and menu.lst, and running GRUB...                             ");
+                            "Modifying fstab, mtab, device.map and menu.lst/grub.cfg, and running GRUB...                             ");
         for (done = FALSE; !done;) {
             popup_and_get_string("Boot device",
@@ -1555 +1556 @@
                 done = TRUE;
             }
-            popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst");
+            popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst/grub.cfg");
             if (!g_text_mode) {
                 newtSuspend();
@@ -1563 +1564 @@
             sprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
             paranoid_system(tmp);
-            sprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                sprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+            }
             paranoid_system(tmp);
             sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);

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

@@ -159 +159 @@
 # ---------------------------------
 
-echo "Trying to use the existing menu.lst file in batch mode" >> $LOGFILE
-chroot /mnt/RESTORING grub --batch < /mnt/RESTORING/boot/grub/menu.lst
+if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ]; then
+    GRUBCFGFILE=/boot/grub/menu.lst
+elif [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ]; then
+    GRUBCFGFILE=/boot/grub/grub.cfg
+else
+    echo "Unable to find Grub conf file"
+    exit -1
+fi
+echo "Trying to use the existing $GRUBCFGFILE file in batch mode" >> $LOGFILE
+chroot /mnt/RESTORING grub --batch < /mnt/RESTORING$GRUBCFGFILE
 res=$?
-echo "menu.lst approach returned $res" >> $LOGFILE
+echo "$GRUBCFGFILE approach returned $res" >> $LOGFILE
 [ "$res" -eq "0" ] && exit 0
 

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

@@ -57 +57 @@
 LocateOldGrub() {
     old_grubconf=""
-    if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ] ; then
-        LogIt "No need for menu.lst search." 2
-        old_grubconf=/mnt/RESTORING/boot/grub/menu.lst
+    if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ] || [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ] ; then
+        LogIt "No need for menu.lst/grub.cfg search." 2
+        if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ]; then
+            old_grubconf=/mnt/RESTORING/boot/grub/menu.lst
+        elif [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ]; then
+            old_grubconf=/mnt/RESTORING/boot/grub/grub.cfg
+        fi
         if [ -L "$old_grubconf" ] ; then
             l=`readlink "$old_grubconf"`
@@ -120 +124 @@
 LogIt "OK so far: I've found all the files I need." 2
 new_fstab=/mnt/RESTORING/etc/fstab.NEW
-new_grubconf=/mnt/RESTORING/boot/grub/menu.lst.NEW
+if [ -f /mnt/RESTORING/boot/grub/menu.lst ]; then
+    new_grubconf=/mnt/RESTORING/boot/grub/menu.lst.NEW
+elif [ -f /mnt/RESTORING/boot/grub/grub.cfg ]; then
+    new_grubconf=/mnt/RESTORING/boot/grub/grub.cfg.NEW
+fi
 # change back to /tmp if /mnt/RESTORING/etc be problematic