Changeset 2095 in MondoRescue

Timestamp:

Dec 17, 2008, 5:26:31 PM (16 years ago)

Author:

Bruno Cornec

Message:

Use /boot/grub/menu.lst everywhere instead of meesing up with /etc/grub.conf

Location:

branches/2.2.8/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/grub-install.patched (modified) (1 diff)
• restore-scripts/mondo/stabgrub-me (modified) (4 diffs)

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

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

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

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

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

@@ -158 +158 @@
 # ---------------------------------
 
-echo "Trying to use the existing grub.conf file in batch mode" >> $LOGFILE
-chroot /mnt/RESTORING grub --batch < /mnt/RESTORING/etc/grub.conf
+echo "Trying to use the existing menu.lst file in batch mode" >> $LOGFILE
+chroot /mnt/RESTORING grub --batch < /mnt/RESTORING/boot/grub/menu.lst
 res=$?
-echo "Grub.conf approach returned $res" >> $LOGFILE
+echo "menu.lst approach returned $res" >> $LOGFILE
 [ "$res" -eq "0" ] && exit 0
 

branches/2.2.8/mondo/src/restore-scripts/mondo/grub-install.patched

@@ -500 +500 @@
 rm -f $log_file
 
-if ! test -e ${grubdir}/grub.conf ; then
-    test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
-fi
-
 # Create a safe temporary file.
 test -n "$mklog" && log_file=`$mklog`

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

@@ -19 +19 @@
 LocateOldFstab() {
     old_fstab=""
-    old_grubconf=""
     if [ -f "/mnt/RESTORING/etc/fstab" ] ; then
         LogIt "No need for fstab search." 2
 #        fstab_list=/mnt/RESTORING/etc/fstab
         old_fstab=/mnt/RESTORING/etc/fstab
-        old_grubconf=/mnt/RESTORING/etc/grub.conf
-        # For some distros, e.g. Debian, /etc/grub.conf is a symbolic link
-        # which we need to resolve and prepend with /mnt/RESTORING because
-        # we run this outside the chroot.
-        if [ -L "$old_grubconf" ] ; then
-            l=`readlink "$old_grubconf"`
-            if [ _"`echo $l | cut -c1`" = _"/" ]; then
-                # If readlink gives an absolute path it's related to the chroot
-                old_grubconf=/mnt/RESTORING/$l
-            else
-                # If readlink gives a relative path, it's in the same dir
-                old_grubconf=/mnt/RESTORING/etc/$l
-            fi
-        fi  
         return 0
     elif [ -f "/mnt/cdrom/archives/CUCKOO" ] ; then
@@ -65 +50 @@
         return 1
     fi
-    old_grubconf=$where_they_live/grub.conf
     old_fstab=$where_they_live/fstab
-    LogIt "GRUB and fstab found." 2
+    LogIt "fstab found." 2
     return 0
+}
+
+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 [ -L "$old_grubconf" ] ; then
+            l=`readlink "$old_grubconf"`
+            if [ _"`echo $l | cut -c1`" = _"/" ]; then
+                # If readlink gives an absolute path it's related to the chroot
+                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
+            fi
+        fi  
+        return 0
+    fi
+    LogIt "GRUB not found." 2
+    return 1
 }
 
@@ -106 +111 @@
 LogIt "stabgrub-me '$1' --- starting"
 LocateOldFstab
+LocateOldGrub
 old_mountlist=/tmp/mountlist.original
 new_mountlist=/tmp/mountlist.txt
@@ -114 +120 @@
 LogIt "OK so far: I've found all the files I need." 2
 new_fstab=/mnt/RESTORING/etc/fstab.NEW
-new_grubconf=/mnt/RESTORING/etc/grub.conf.NEW
+new_grubconf=/mnt/RESTORING/boot/grub/menu.lst.NEW
 # change back to /tmp if /mnt/RESTORING/etc be problematic