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

Timestamp:

Sep 29, 2013, 9:31:34 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:

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

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

@@ -90 +90 @@
     fatal_error("Cannot openin outfname");
 }
-for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+for (mr_getline(incoming, fin); !feof(fin) && (incoming != NULL); mr_getline(incoming, fin)) {
     mr_strip_spaces(incoming);
 
@@ -140 +140 @@
 }
 if (file[0] == '/' && file[1] == '/') {
-    mr_asprintf(tmp, "%s", file);
-    mr_free(file);
+    tmp = file;
 
     mr_asprintf(file, "%s", tmp + 1);
@@ -174 +173 @@
 * @return 0 for success, nonzero for failure.
 */
-int iso_fiddly_bits(bool nuke_me_please)
-{
-    char *mount_isodir_command = NULL;
-    char *command = NULL;
-    char *mds = NULL;
-    int retval = 0, i;
-    char *isodir_format = NULL;
+int iso_fiddly_bits(bool nuke_me_please) {
+
+char *mount_isodir_command = NULL;
+char *command = NULL;
+char *mds = NULL;
+int retval = 0, i;
+char *isodir_format = NULL;
 
 g_ISO_restore_mode = TRUE;
@@ -305 +304 @@
             mr_strcat(additional_parameters, "-o ro");
         }
+        mr_free(tmp);
+
         tmp = find_home_of_exe("setfattr");
         if (tmp) {
@@ -374 +375 @@
 mr_free(mountpoint);
 
-    return (res);
+return (res);
 }
 /**************************************************************************
@@ -418 +419 @@
             mr_free(tmp);
             res = mount_device(mountlist->el[lino].device, mountlist->el[lino].mountpoint, mountlist->el[lino].format, writeable);
-
             retval += res;
             if (res) {
@@ -660 +660 @@
 assert(bkpinfo != NULL);
 assert(cfgf != NULL);
+log_it("Entering read_cfg_file_into_bkpinfo");
 
 media_specified_by_user = bkpinfo->backup_media_type;   // or 'none', if not specified
@@ -676 +677 @@
         bkpinfo->please_dont_eject = TRUE;
     } else if (!strcmp(value, "iso")) {
-        // Patch by Conor Daly - 2004/07/12
         bkpinfo->backup_media_type = iso;
         if (am_I_in_disaster_recovery_mode()) {
@@ -687 +687 @@
                 bkpinfo->backup_media_type = cdr;
                 run_program_and_log_output("umount -d "MNT_CDROM, 1);
-                log_it
-                    ("Re-jigging configuration AGAIN. CD-R, not ISO.");
+                log_it("Re-jigging configuration AGAIN. CD-R, not ISO.");
             }
         }
@@ -698 +697 @@
             mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
         }
+        log_it("Setting Prefix to %s", bkpinfo->prefix);
     } else if ((!strcmp(value, "netfs")) || (!strcmp(value, "nfs"))) {
         /* Stay compatible with previous versions by allowing nfs as an entry here */
@@ -727 +727 @@
         tmp = call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE);
         if (strstr(tmp, "pxe")) {
-            /* We need to override prefix value in PXE mode as it's 
+            /* We need to override prefix value in PXE mode as it's
             * already done in start-netfs */
             envtmp1 = getenv("imgname");
@@ -754 +754 @@
         mr_free(bkpinfo->media_device);
         mr_asprintf(bkpinfo->media_device, "/dev/cdrom");
-        bkpinfo->media_size[0] = 1999 * 1024;
-        bkpinfo->media_size[1] = 650;   /* good guess */
+        bkpinfo->media_size = 650;  /* good guess */
     } else if (bkpinfo->backup_media_type == usb) {
         envtmp1 = getenv("MRUSBDEV");
@@ -778 +777 @@
         value = read_cfg_var(cfg_file, "media-size");
         if (value != NULL) {
-            bkpinfo->media_size[1] = atol(value);
+            bkpinfo->media_size = atol(value);
             mr_free(value);
         } else {
-            bkpinfo->media_size[1] = 0L;
+            bkpinfo->media_size = 0L;
         }
         log_msg(2, "Backup medium is TAPE --- dev=%s", bkpinfo->media_device);
@@ -787 +786 @@
         mr_free(bkpinfo->media_device);
         mr_asprintf(bkpinfo->media_device, "/dev/cdrom");   /* we don't really need this var */
-        bkpinfo->media_size[0] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
-        bkpinfo->media_size[1] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
-        log_msg(2, "Backup medium is CD-R[W]");
+        bkpinfo->media_size = 1999 * 1024;  /* 650, probably, but we don't need this var anyway */
+        log_msg(2, "Backup medium is similar to CD-R[W]");
     }
 } else {
@@ -968 +966 @@
         mr_free(tmp1);
     }
-
 } else if (bkpinfo->backup_media_type == iso) {
     /* Patch by Conor Daly 23-june-2004 
@@ -1044 +1041 @@
     if (! bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type != media_specified_by_user) {
-            log_msg(2,
-                    "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
+            log_msg(2, "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
             interactively_obtain_media_parameters_from_user(FALSE);
             media_specified_by_user = bkpinfo->backup_media_type;
@@ -1086 +1082 @@
 int res = 0;
 pid_t pid;
+bool extract_mountlist_stub = FALSE;
 
 assert(bkpinfo != NULL);
@@ -1234 +1231 @@
             popup_and_OK("You'll now be chrooted under your future / partition.\nEdit /etc/mkinitcpio.conf if needed and rebuild your initrd with the kernel preset name e.g.\nmkinitcpio -p kernel26\nThen type exit to finish.\n");
         } else {
-            popup_and_OK("You'll now be chrooted under your future / partition.\nGo under /boot and rebuild your initrd with\nmkinitrd -f -v initrd-2.x.y.img 2.x.y e.g.\nThen type exit to finish.");
+            popup_and_OK("You'll now be chrooted under your future / partition.\nGo under /boot and rebuild your init(rd|ramfs) with\nmkinitrd -f -v initrd-2.x.y.img 2.x.y e.g.\nor initramfs, dracut, ... Then type exit to finish.");
         }
         mvaddstr_and_log_it(g_currentY, 0, "Modifying initrd...");
@@ -1435 +1432 @@
 
             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")) {
+                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();
+                }
+                mr_asprintf(editor, "%s", find_my_editor());
+                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;
+                }
+                popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst/grub.cfg");
+                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);
+                }
+                paranoid_system(tmp);
+                mr_free(tmp);
+
                 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;
-            }
-            popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst/grub.cfg");
-            if (!g_text_mode) {
-                newtSuspend();
-            }
-            mr_asprintf(editor, "%s", find_my_editor());
-
-            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);
-            }
-            paranoid_system(tmp);
-            mr_free(tmp);
-
-            mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            mr_free(tmp);
-            mr_free(editor);
-
-            if (!g_text_mode) {
-                newtResume();
+                paranoid_system(tmp);
+                mr_free(tmp);
+                mr_free(editor);
+    
+                if (!g_text_mode) {
+                    newtResume();
+                }
             }
         }
@@ -1525 +1525 @@
             log_msg(1, "WARNING - grub-MR not found; using grub-install");
         }
-        mvaddstr_and_log_it(g_currentY,
-                            0,
-                            "Running GRUB...                                                 ");
+        mvaddstr_and_log_it(g_currentY, 0, "Running GRUB...                                                 ");
         log_it("%s",command);
         res = run_program_and_log_output(command, 1);
@@ -1611 +1609 @@
                 paranoid_system(tmp);
                 mr_free(tmp);
-
                 mr_free(editor);
 
@@ -1688 +1685 @@
                 paranoid_system(tmp);
                 mr_free(tmp);
-
                 mr_free(editor);
 
@@ -2114 +2110 @@
     paranoid_free(raidlist);
 }
-
-