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

Timestamp:

Jun 25, 2013, 10:53:14 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Apply fixes to 3.1 tree so that at least mondo compiles again (but that branch probably doesn't work at all again).

File:

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

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

@@ -80 +80 @@
 char *incoming = NULL;
 char *question = NULL;
-char *q;
-char *q;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
@@ -182 +180 @@
     char *mds = NULL;
     int retval = 0, i;
-    bool already_mounted = FALSE;
     char *isodir_format = NULL;
 
@@ -553 +550 @@
     mr_free(command);
 
-    chdir(bkpinfo->tmpdir);
+    if (chdir(bkpinfo->tmpdir)) {
+        //FIXME
+    }
 
     mr_free(mountpt);
@@ -576 +575 @@
         if (try_plan_B) {
             log_msg(2, "gcffa --- OK, switching to Plan B");
-            chdir(bkpinfo->tmpdir);
+            if (chdir(bkpinfo->tmpdir)) {
+                // FIXME
+            }
             run_program_and_log_output("mkdir -p tmp", FALSE);
 
@@ -1082 +1083 @@
 char *command = NULL;
 char *tmp;
-char *tmp1 = NULL;
 char *q;
 int res = 0;
@@ -1402 +1402 @@
     bool mntlistchg = FALSE;
     FILE *fin = NULL;
-    bool mntlistchg = FALSE;
-    FILE *fin = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(bd);
@@ -1436 +1434 @@
             }
 
-            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();
-                }
-                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);
-                } 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);
-                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) {
-                    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();
-                    paranoid_system("chroot " MNT_RESTORING);
-                    newtResume();
-                    popup_and_OK("Thank you.");
-                } else {
-                    popup_and_OK("GRUB is now installed correctly");
-                    done = TRUE;
-                }
+            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();
+            }
+            mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
+            }
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
+            }
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            if (!g_text_mode) {
+                newtResume();
+            }
+            mr_asprintf(command, "stabgrub-me %s", boot_device);
+            res = run_program_and_log_output(command, 1);
+            mr_free(command);
+            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();
+                paranoid_system("chroot " MNT_RESTORING);
+                newtResume();
+                popup_and_OK("Thank you.");
+            } else {
+                popup_and_OK("GRUB is now installed correctly");
                 done = TRUE;
             }
@@ -1879 +1881 @@
     FILE *fout;
     char *incoming = NULL;
-    char *q;
-    char *q;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);