Changeset 2904 in MondoRescue

Timestamp:

Nov 21, 2011, 3:46:46 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #511 now stabgrub is called also after conf file modifications

Location:

branches/3.0/mondo/src

Files:

• common/libmondo-files-EXT.h (modified) (1 diff)
• common/libmondo-files.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/3.0/mondo/src/common/libmondo-files-EXT.h

@@ -45 +45 @@
 extern long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);
 
-extern int make_grub_install_scriptlet(char *outfile);
 extern int read_one_liner_data_file(char *fname, char *contents);

branches/3.0/mondo/src/common/libmondo-files.h

@@ -44 +44 @@
 int make_hole_for_dir(char *outdir_fname);
 long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);
-int make_grub_install_scriptlet(char *outfile);
-
 int read_one_liner_data_file(char *fname, char *contents);

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

@@ -1444 +1444 @@
             if (res) {
                 popup_and_OK
-                    ("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
-                newtSuspend();
-                system("chroot " MNT_RESTORING);
-                newtResume();
-                popup_and_OK("Thank you.");
+                    ("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+                sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                sprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                }
+                paranoid_system(tmp);
+                sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                if (!g_text_mode) {
+                    newtResume();
+                }
+                sprintf(command, "stabgrub-me %s", boot_device);
+                res = run_program_and_log_output(command, 1);
+                if (res) {
+                    popup_and_OK
+                        ("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
+                    newtSuspend();
+                    system("chroot " MNT_RESTORING);
+                    newtResume();
+                    popup_and_OK("Thank you.");
+                } else {
+                    popup_and_OK("GRUB is now installed correctly");
+                    done = TRUE;
+                }
             } else {
                 done = TRUE;
-            }
-            popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst/grub.cfg");
-            if (!g_text_mode) {
-                newtSuspend();
-            }
-            sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            sprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
-                sprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
-            } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
-                sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
-            }
-            paranoid_system(tmp);
-            sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            if (!g_text_mode) {
-                newtResume();
             }
         }