Changeset 2944 in MondoRescue for branches/3.0/mondo/src/common

Timestamp:

Feb 3, 2012, 2:12:47 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds grub2 support (Michael Caerwyn mcaerwyn_at_gmail.com)

Location:

branches/3.0/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-mountlist.c (modified) (1 diff)

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

@@ -701 +701 @@
                 ("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
         }
-        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg"))) {
+        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/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?");
+                ("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
     } else if (bkpinfo->boot_loader == 'E') {

branches/3.0/mondo/src/common/libmondo-mountlist.c

@@ -949 +949 @@
     }
     paranoid_fclose(fout);
+    if (!(fout = fopen(MONDO_MNTLISTCHG, "w"))) {
+        log_OS_error("WMTD - Cannot openout "MONDO_MNTLISTCHG);
+        return (1);
+    }
+    fprintf(fout, "the mountlist was changed by mondorestore\n");
+    paranoid_fclose(fout);
     return (0);
 }