Changeset 2950

Timestamp:

02/16/12 01:55:19 (15 months ago)

Author:

bruno

Message:

• Fix #580 by checking a modification on the mountlist and then asking for conf file adaptation

File:

• branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

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

@@ -1408 +1408 @@
     char *editor;
 
-    int res;
+    int res = 0;        /*  FALSE */
     int done;
+    bool mntlistchg = FALSE;
+    FILE *fin = NULL;
 
     malloc_string(command);
@@ -1438 +1440 @@
                             0,
                             "Modifying fstab, mtab, device.map and menu.lst/grub.cfg, and running GRUB...                             ");
+        /*  Did we changed the mountlist ? If yes, then force editing conf files */
+        if ((fin = fopen(MONDO_MNTLISTCHG, "r")) != NULL) {
+            mntlistchg = TRUE;
+        }
         for (done = FALSE; !done;) {
             popup_and_get_string("Boot device",
                                  "Please confirm/enter the boot device. If in doubt, try /dev/hda",
                                  boot_device, MAX_STR_LEN / 4);
-            sprintf(command, "stabgrub-me %s", boot_device);
-            res = run_program_and_log_output(command, 1);
-            if (res) {
-                popup_and_OK
-                    ("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+            /*  Only try to adapt grub here first if the mountlist wasn't changed before */
+            if (! mntlistchg) {
+                sprintf(command, "stabgrub-me %s", boot_device);
+                res = run_program_and_log_output(command, 1);
+            }
+            if ((res) || (mntlistchg)){
+                if (res) {
+                    popup_and_OK("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                } else {
+                    popup_and_OK("The mountlist was changed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                }
                 if (!g_text_mode) {
                     newtSuspend();