Changeset 2451 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

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/common/libmondo-archive.c (modified) (1 diff)

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') {