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

Timestamp:

Apr 18, 2008, 1:41:41 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1902:1923 $SVN_M/branches/2.2.6

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (6 diffs)
• mondorestore.c (modified) (5 diffs)
• mr-externs.h (modified) (1 diff)

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

@@ -1118 +1118 @@
                     BIGGIELIST_TXT_STUB,
                     FILELIST_FULL_STUB,
-                    "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+                    "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1135 +1135 @@
                     BIGGIELIST_TXT_STUB,
                     FILELIST_FULL_STUB,
-                    "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+                    "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1142 +1142 @@
             if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
                 fatal_error
-                    ("all.tar.gz did not include tmp/biggielist.txt");
+                    ("all.tar.gz did not include ./tmp/biggielist.txt");
             }
             if (!does_file_exist(FILELIST_FULL_STUB)) {
                 fatal_error
-                    ("all.tar.gz did not include tmp/filelist.full.gz");
+                    ("all.tar.gz did not include ./tmp/filelist.full.gz");
             }
         }
@@ -2083 +2083 @@
             1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
             MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
+            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm");
     mr_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2113 +2113 @@
     char *ramdisk_fname = NULL;
     char *mountlist_file = NULL;
-    int res = 0;
 
     bool try_plan_B = FALSE;
@@ -2205 +2204 @@
                 mr_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
-                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm");   // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
                 mr_free(command);

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

@@ -924 +924 @@
 
     strcpy(bkpinfo->restore_path, "/");
-    if (!g_restoring_live_from_cd) {
+    if (!g_restoring_live_from_cd && !g_restoring_live_from_nfs) {
         popup_and_OK
             (_("Please insert tape/CD/USB key, then hit 'OK' to continue."));
         sleep(1);
     }
-    interactively_obtain_media_parameters_from_user(FALSE);
+    if (!g_restoring_live_from_nfs) {
+        interactively_obtain_media_parameters_from_user(FALSE);
+    }
     if (!bkpinfo->media_device) {
         mr_msg(2, "Warning - failed to find media dev");
@@ -948 +950 @@
     retval = load_mountlist(mountlist, g_mountlist_fname);
     load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-    filelist = process_filelist_and_biggielist();
-    if (filelist) {
+
+    if (!g_restoring_live_from_nfs && (filelist = process_filelist_and_biggielist())) {
         save_filelist(filelist, "/tmp/selected-files.txt");
         mr_asprintf(&old_restpath,bkpinfo->restore_path);
@@ -961 +963 @@
         strcpy(bkpinfo->restore_path, old_restpath);
         mr_free(old_restpath);
+    } else {
+        retval += restore_everything(NULL);
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -2706 +2710 @@
     paranoid_fclose(fout);
     sprintf(command,
-            "tar -zxvf %s tmp/mondo-restore.cfg tmp/mountlist.txt tmp/filelist.full tmp/biggielist.txt",
+            "tar -zxvf %s ./tmp/mondo-restore.cfg ./tmp/mountlist.txt ./tmp/filelist.full ./tmp/biggielist.txt",
             datadisks_fname);
     run_program_and_log_output(command, 4);
@@ -3044 +3048 @@
             g_restoring_live_from_cd = TRUE;
         }
+        if (bkpinfo->backup_media_type == nfs) {
+            g_restoring_live_from_nfs = TRUE;
+        }
         if (argc == 5 && strcmp(argv[1], "--monitas-live") == 0) {
             retval =

branches/stable/mondo/src/mondorestore/mr-externs.h

@@ -108 +108 @@
 extern bool g_text_mode;
 extern bool g_restoring_live_from_cd;
+extern bool g_restoring_live_from_nfs;
 extern int fput_string_one_char_at_a_time(FILE *, char *);