Changeset 801 in MondoRescue for branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

Timestamp:

Sep 22, 2006, 1:06:49 AM (18 years ago)

Author:

Bruno Cornec

Message:

Should fix bug #21 by exporting variables from start-nfs and overriding values in mondo-rstr-tools.c with thee exports

File:

• branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -1044 +1044 @@
                     strcpy(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;
@@ -1151 +1158 @@
             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 
@@ -1202 +1216 @@
                     } else {
                         log_msg(1,
-                                "You backed up to disk, then burned some CDs. Naughty monkey!");
+                                "You backed up to disk, then burned some CDs.");
                     }
                 }