Changeset 2451 in MondoRescue

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)

Location:

branches/2.2.10

Files:

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

branches/2.2.10/mindi/mindi

@@ -1488 +1488 @@
             LogAll "----------- syslinux's errors --------------" |tee -a $LOGFILE
             cat $MINDI_TMP/syslinux.log |tee -a $LOGFILE
+            echo "----------- syslinux's conf --------------" |tee -a $LOGFILE
+            cat $MINDI_TMP/usb/syslinux.cfg |tee -a $LOGFILE
             LogAll "Failed to create USB image."
         else
@@ -1695 +1697 @@
         return 0
     fi
-    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
     LogFile "Free space left on image = $free_space KB" 
@@ -1790 +1791 @@
         return 0
     fi
-    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
     LogFile "Free space left on image = $free_space KB" 
@@ -2035 +2035 @@
     res=`$FDISK -s $device 2>> $LOGFILE`
     # end patch
-    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
+    # take only the first in case of multiple mount (cifs, nfs, ...)
+    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2 | head -1`
     [ "$res" = "" ] && res="-1"
     echo $res

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

@@ -687 +687 @@
             run_program_and_log_output("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 /boot/grub/menu.lst but I cannot find it there. What is wrong with your Linux distribution?");
+        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 or /boot/grub/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
     } else if (bkpinfo->boot_loader == 'E') {

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

@@ -1387 +1387 @@
     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");
@@ -1512 +1513 @@
         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;) {
             p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
@@ -1538 +1539 @@
                 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();
@@ -1552 +1553 @@
             mr_free(tmp);
 
-            mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+            }
             paranoid_system(tmp);
             mr_free(tmp);

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
 

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