Changeset 1916 in MondoRescue

Timestamp:

Apr 17, 2008, 1:14:29 AM (16 years ago)

Author:

Bruno Cornec

Message:

Apply patch mondo.live-nfs.patch (Mark Pinkerton <Mark.Pinkerton_at_emageon.com>)

Location:

branches/2.2.6/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (4 diffs)
• mondorestore/mr-externs.h (modified) (1 diff)

branches/2.2.6/mondo/src/common/libmondo-devices.c

@@ -273 +273 @@
  */
 bool g_restoring_live_from_cd = FALSE;
+bool g_restoring_live_from_nfs = FALSE;
 
 extern t_bkptype g_backup_media_type;   // set by main()

branches/2.2.6/mondo/src/mondorestore/mondo-restore.c

@@ -926 +926 @@
 
     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);
+    }
     log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     if (!bkpinfo->media_device[0]) {
@@ -949 +951 @@
     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");
         strcpy(old_restpath, bkpinfo->restore_path);
@@ -964 +966 @@
         }
         strcpy(bkpinfo->restore_path, old_restpath);
+    } else {
+        retval += restore_everything(NULL);
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -3143 +3147 @@
             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/2.2.6/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 *);