Changeset 3147 in MondoRescue for branches/3.1/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (19 diffs)

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

@@ -80 +80 @@
 char *incoming = NULL;
 char *question = NULL;
+char *q;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
@@ -209 +210 @@
 if (is_this_device_mounted(g_isodir_device)) {
     log_to_screen("WARNING - isodir is already mounted");
-    already_mounted = TRUE;
 } else {
     mr_asprintf(mount_isodir_command, "mount %s", g_isodir_device);
@@ -1082 +1082 @@
 char *tmp;
 char *tmp1 = NULL;
+char *q;
 int res = 0;
 pid_t pid;
@@ -1088 +1089 @@
 malloc_string(tmp);
 
-    getcwd(tmp, MAX_STR_LEN);
-    chdir(bkpinfo->tmpdir);
+    if (getcwd(tmp, MAX_STR_LEN) == NULL) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->tmpdir)) {
+        // FIXME
+    }
     log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
     log_to_screen("Extracting filelist and biggielist from media...");
@@ -1116 +1121 @@
         }
     }
-    chdir(tmp);
+    if (chdir(tmp)) {
+        // FIXME
+    }
 
     log_msg(2, "Forking");
@@ -1147 +1154 @@
     unlink(MINDI_CACHE"/filelist.full.gz");
     if (g_text_mode) {
-        printf("Restore which directory? --> ");
-        mr_getline(tmp1, stdin);
-        toggle_path_selection(filelist, tmp1, TRUE);
-        if (strlen(tmp1) == 0) {
+        q = NULL;
+        while (q == NULL) {
+            printf("Restore which directory? --> ");
+            mr_getline(q, stdin);
+        }
+        toggle_path_selection(filelist, q, TRUE);
+        if (strlen(q) == 0) {
             res = 1;
         } else {
             res = 0;
         }
-        mr_free(tmp1);
+        mr_free(q);
     } else {
         res = edit_filelist(filelist);
@@ -1229 +1239 @@
             newtSuspend();
         }
-        (void)system("chroot " MNT_RESTORING);
+        paranoid_system("chroot " MNT_RESTORING);
         if (!g_text_mode) {
             newtResume();
@@ -1271 +1281 @@
     backup_crucial_file(MNT_RESTORING, "/boot/grub/menu.lst");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/grub.cfg");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/grub.cfg");
     backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
     backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/device.map");
     backup_crucial_file(MNT_RESTORING, "/etc/mtab");
     device = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "bootloader.device");
@@ -1385 +1397 @@
     char *p = NULL;
 
-    int res = 0;
     bool done;
+    int res = 0;        /*  FALSE */
+    bool mntlistchg = FALSE;
+    FILE *fin = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(bd);
@@ -1397 +1411 @@
                             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;) {
             p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
@@ -1406 +1424 @@
                 continue;
             }
-            mr_asprintf(command, "stabgrub-me %s", p);
-            mr_free(p);
-
-            res = run_program_and_log_output(command, 1);
-            mr_free(command);
-
-            if (res) {
+            /*  Only try to adapt grub here first if the mountlist wasn't changed before */
+            if (! mntlistchg) {
+                mr_asprintf(command, "stabgrub-me %s", p);
+                mr_free(p);
+
+                res = run_program_and_log_output(command, 1);
+                mr_free(command);
+            }
+
+            if ((res) || (mntlistchg)){
                 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();
@@ -1426 +1450 @@
                 } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
                     sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
                 }
                 paranoid_system(tmp);
-                sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
+                                }
                 paranoid_system(tmp);
                 if (!g_text_mode) {
@@ -1439 +1469 @@
                         ("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);
+                    paranoid_system("chroot " MNT_RESTORING);
                     newtResume();
                     popup_and_OK("Thank you.");
@@ -1501 +1531 @@
                 ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
             newtSuspend();
-            system("chroot " MNT_RESTORING);
+            paranoid_system("chroot " MNT_RESTORING);
             newtResume();
             popup_and_OK("Thank you.");
@@ -1846 +1876 @@
     FILE *fout;
     char *incoming = NULL;
+    char *q;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
@@ -1935 +1966 @@
                        "in preparation for the post-restoration reboot.",
                        "", mountlist->entries);
-    chdir("/");
+    if (chdir("/")) {
+        // FIXME
+    }
     for (i = 0;
          i < 10
@@ -2032 +2065 @@
 /* @} - end restoreUtilityGroup */
 
-void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                           int wait_for_percentage)
+void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage)
 {
     struct raidlist_itself *raidlist;
-    int unfinished_mdstat_devices = 9999, i;
+    int unfinished_mdstat_devices = 9999;
+    int i = 0;
     char *screen_message = NULL;
 
@@ -2045 +2078 @@
     while (unfinished_mdstat_devices > 0) {
             // FIXME: Prefix '/dev/' should really be dynamic!
-        if (parse_mdstat(raidlist, "/dev/")) {
+        if (parse_mdstat(MDSTAT_FILE, raidlist, "/dev/")) {
             log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
             log_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
-        for (unfinished_mdstat_devices = i = 0; i <= raidlist->entries; i++) {
+        for (unfinished_mdstat_devices = 0; i <= raidlist->entries; i++) {
             if (raidlist->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;
@@ -2067 +2100 @@
                     sleep(2);
                     // FIXME: Prefix '/dev/' should really be dynamic!
-                    if (parse_mdstat(raidlist, "/dev/")) {
+                    if (parse_mdstat(MDSTAT_FILE, raidlist, "/dev/")) {
                         break;
                     }