Changeset 1903 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (13 diffs)
• mondorestore.c (modified) (8 diffs)

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

@@ -56 +56 @@
 char *g_getfacl = NULL;
 
+extern void kill_anything_like_this(char *str);
+
 /**
  * @addtogroup restoreUtilityGroup
@@ -387 +389 @@
 
     char *command = NULL;
+    char *tmp = NULL;
     char *mountdir = NULL;
     char *mountpoint = NULL;
@@ -439 +442 @@
         mr_msg(2, "command='%s'", command);
     }
+
     res = run_program_and_log_output(command, TRUE);
+    if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
+        mr_msg(1, "Re-trying without the fancy extra parameters");
+        mr_asprintf(&tmp, "mount -t %s %s %s 2>> %s", format, device,
+            mountdir, MONDO_LOGFILE);
+        res = run_program_and_log_output(tmp, TRUE);
+        mr_free(tmp);
+    }
     if (res) {
         mr_msg(1, "Unable to mount device %s (type %s) at %s", device,
@@ -449 +460 @@
         } else {
             mr_msg(2, "Retrying w/o the '-t' switch");
-            mr_free(command);
-
-            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir,
+            mr_asprintf(&tmp, "mount %s %s 2>> %s", device, mountdir,
                     MONDO_LOGFILE);
-            mr_msg(2, "2nd command = '%s'", command);
-            res = run_program_and_log_output(command, TRUE);
+            mr_msg(2, "2nd command = '%s'", tmp);
+            res = run_program_and_log_output(tmp, TRUE);
+            mr_free(tmp);
             if (res == 0) {
                 mr_msg(1,
@@ -473 +483 @@
     }
     mr_free(mountpoint);
-
     return (res);
 }
@@ -623 +632 @@
             mr_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
+
 #ifdef __FreeBSD__
         mr_asprintf(&mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
@@ -687 +697 @@
             break;
         } else {
-            mr_msg(2, "Failed to mount CD-ROM drive.");
+            mr_msg(2, "Failed to mount device.");
             sleep(5);
             run_program_and_log_output("sync", FALSE);
@@ -806 +816 @@
         } else if (!strcmp(value, "nfs")) {
             bkpinfo->backup_media_type = nfs;
+            bkpinfo->please_dont_eject = TRUE;
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
                 mr_allocstr(bkpinfo->prefix,value);
@@ -842 +853 @@
         fatal_error("backup-media-type not specified!");
     }
+
     if (bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type == cdstream) {
@@ -1286 +1298 @@
 #endif
     char *name = NULL;
+    char *cmd = NULL;
 
     malloc_string(device);
     malloc_string(name);
+
+    /* In order to have a working bootloader, we need to have all devices
+     * ready in the chroot. If they are not there (udev) then copy them from
+     * the current /dev location 
+     */
+    asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
+    run_program_and_log_output(cmd, 3);
+    paranoid_free(cmd);
+
     backup_crucial_file(MNT_RESTORING, "/etc/fstab");
     backup_crucial_file(MNT_RESTORING, "/etc/grub.conf");
     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, "/etc/mtab");
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
@@ -1312 +1336 @@
         mr_free(tmp);
     } else {
-        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*$'", device);
+        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
             mr_free(tmp);
@@ -1534 +1558 @@
                     newtSuspend();
                 }
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
 
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/elilo.conf", editor);
+                mr_asprintf(&tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -2173 +2197 @@
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
                 log_to_screen(_
-                              ("Cannot find config info on tape/CD"));
+                              ("Cannot find config info on media"));
                 return (1);
             }

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -437 +437 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     iamhere("Done loading config file; resizing ML");
-    if (bkpinfo->backup_media_type != usb) {
+    if (bkpinfo->backup_media_type == nfs) {
         mr_asprintf(&tmp,bkpinfo->prefix);
         if (popup_and_get_string
@@ -1994 +1994 @@
                        _("Please wait. This may take some time."),
                        "", total_slices);
-    for (bigfileno = 0, finished = FALSE; !finished;) {
+    for (bigfileno = 0 ; bigfileno < noof_biggiefiles ;) {
         mr_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
         if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
@@ -2004 +2004 @@
                     g_current_media_number);
             mr_msg(3, "Slicename would have been %s",
-                    slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, ""));
+                    slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
             // I'm not positive 'just_changed_cds' is even necessary...
             if (just_changed_cds) {
@@ -2017 +2017 @@
                 just_changed_cds = TRUE;
             } else {
+                /* That big file doesn't exist, but the followings may */
+                /* So we need to continue looping */
                 mr_msg(2, "There was no bigfile #%ld. That's OK.",
-                        bigfileno + 1);
+                    bigfileno + 1);
                 mr_msg(2, "I'm going to stop restoring bigfiles now.");
-                finished = TRUE;
+                retval++;
+                bigfileno++;
             }
         } else {
@@ -3012 +3015 @@
     }
 
+    if (argc == 3 && strcmp(argv[1], "-K") == 0) {
+        g_loglevel = atoi(argv[2]);
+        log_msg(1,"Loglevel forced to %s",g_loglevel);
+    }
 
     if (argc == 2 && strcmp(argv[1], "--live-grub") == 0) {
@@ -3169 +3176 @@
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                _("Run complete. Please remove CD/media and reboot."));
+                                _("Run complete. Please remove media and reboot."));
         } else {
             run_program_and_log_output("sync", FALSE);
@@ -3226 +3233 @@
     unlink("/tmp/mondo-run-prog.tmp");
     set_signals(FALSE);
-    mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
 
     log_to_screen
@@ -3243 +3247 @@
         run_program_and_log_output("mount / -o remount,rw", 2);
     }                           // for b0rken distros
+    mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)