Changeset 2449 in MondoRescue for branches/2.2.9/mondo/src/restore-scripts

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/restore-scripts/mondo

Files:

• grub-MR (modified) (1 diff)
• stabgrub-me (modified) (2 diffs)

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