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

Timestamp:

Nov 2, 2006, 1:45:12 AM (19 years ago)

Author:

Bruno Cornec

Message:

Fix bug #89 (env var were queried too early, and not ncessarily in PXE mode)

File:

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

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

@@ -1046 +1046 @@
                     strcpy(bkpinfo->prefix,STD_PREFIX);
             }
-            /* We need to override prefix value in PXE mode as it's 
-             * already done in start-nfs */
-            envtmp1 = getenv("imgname");
-            if (envtmp1 == NULL) {
-                fatal_error("no imgname variable in environment");
-            }
             if (strstr(call_program_and_get_last_line_of_output
                ("cat /proc/cmdline"), "pxe")) {
-                    strcpy(bkpinfo->prefix,envtmp1);
+                /* We need to override prefix value in PXE mode as it's 
+                * already done in start-nfs */
+                envtmp1 = getenv("imgname");
+                if (envtmp1 == NULL) {
+                    fatal_error("no imgname variable in environment");
+                }
+                strcpy(bkpinfo->prefix,envtmp1);
             }
 
@@ -1164 +1164 @@
             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 */
-        envtmp1 = getenv("nfsmount");
-        if (envtmp1 == NULL) {
-            fatal_error("no nfsmount variable in environment");
-        }
-        envtmp2 = getenv("dirimg");
-        if (envtmp2 == NULL) {
-            fatal_error("no dirimg variable in environment");
-        }
         if (strstr(call_program_and_get_last_line_of_output
            ("cat /proc/cmdline"), "pxe")) {
-                strcpy(bkpinfo->nfs_mount,envtmp1);
-                strcpy(bkpinfo->nfs_remote_dir,envtmp2);
-            }
+            /* We need to override values in PXE mode as it's 
+            * already done in start-nfs */
+            envtmp1 = getenv("nfsmount");
+            if (envtmp1 == NULL) {
+                fatal_error("no nfsmount variable in environment");
+            }
+            envtmp2 = getenv("dirimg");
+            if (envtmp2 == NULL) {
+                fatal_error("no dirimg variable in environment");
+            }
+            strcpy(bkpinfo->nfs_mount,envtmp1);
+            strcpy(bkpinfo->nfs_remote_dir,envtmp2);
+        }
     } else if (bkpinfo->backup_media_type == iso) {
         /* Patch by Conor Daly 23-june-2004