Changeset 2451 in MondoRescue for branches/2.2.10/mondo/src/restore-scripts/mondo/stabgrub-me

Timestamp:

Oct 6, 2009, 1:34:09 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix a mr_asprintf usage without & causing a seg fault.
• Adds support for grub2 conf file grub.cfg in addition to menu.lst
• Fix for #288: only take the first result in SizeOfPartition in case of multiple mounts
• Improve USB log in case of error by adding the conf file

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/restore-scripts/mondo/stabgrub-me (modified) (2 diffs)

branches/2.2.10/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