Changeset 808 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

Timestamp:

Sep 22, 2006, 11:12:37 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r793:807 $SVN_M/branches/stable
src => common for the moment it's easier to manage merges

File:

• trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (4 diffs)

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -851 +851 @@
                 paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
             }
+            /* We need to override prefix value in PXE mode as it's 
+             * already done in start-nfs */
+            if (strstr(call_program_and_get_last_line_of_output
+               ("cat /proc/cmdline"), "pxe")) {
+                    strcpy(bkpinfo->prefix,getenv("imgname"));
+            }
+
         } else if (!strcmp(value, "tape")) {
             bkpinfo->backup_media_type = tape;
@@ -975 +982 @@
             log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
         }
+        /* We need to override values in PXE mode as it's 
+         * already done in start-nfs */
+        if (strstr(call_program_and_get_last_line_of_output
+           ("cat /proc/cmdline"), "pxe")) {
+                strcpy(bkpinfo->nfs_mount,getenv("nfsmount"));
+                strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));
+            }
     } else if (bkpinfo->backup_media_type == iso) {
         /* Patch by Conor Daly 23-june-2004 
@@ -1037 +1051 @@
                     } else {
                         log_msg(1,
-                                "You backed up to disk, then burned some CDs. Naughty monkey!");
+                                "You backed up to disk, then burned some CDs.");
                     }
                 }
@@ -2385 +2399 @@
 
     assert(wait_for_percentage <= 100);
-    iamhere("Help, my boat is sync'ing. (Get it? Urp! Urp!)");
+    iamhere("wait_until_software_raids_are_prepped");
     while (unfinished_mdstat_devices > 0) {
         if (parse_mdstat(raidlist, "/dev/")) {