Changeset 2451 in MondoRescue for branches/2.2.10/mondo/src/restore-scripts/mondo/grub-MR

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/grub-MR (modified) (1 diff)

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