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

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

File:

• branches/stable/mondo/src/mondorestore/mondorestore.c (modified) (5 diffs)

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 =