Changeset 870 in MondoRescue

Timestamp:

Oct 3, 2006, 4:12:38 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Checks variables berfore getting them from env during restore
• source start-nfs to get env. Var. correctly set for mondorestore

Location:

branches/stable

Files:

• mindi/rootfs/sbin/init (modified) (2 diffs)
• mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

branches/stable/mindi/rootfs/sbin/init

@@ -458 +458 @@
     ExtractDataDisksAndLoadModules
 elif [ "`grep -i pxe /proc/cmdline`" ]; then
-    /sbin/start-nfs
+    # We need to get here exported variables from start-nfs
+    . /sbin/start-nfs
 
     # Simulate a local CD
@@ -467 +468 @@
     HandleCDROMorFloppies
     ExtractDataDisksAndLoadModules
-    /sbin/start-nfs
+    # We need to get here exported variables from start-nfs
+    . /sbin/start-nfs
 fi
 res=$?

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

@@ -973 +973 @@
 {
   /** add mallocs **/
-    char *value;
-    char *tmp;
-    char *command;
-    char *iso_mnt;
-    char *iso_path;
-    char *old_isodir;
+    char *value = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
+    char *iso_mnt = NULL;
+    char *iso_path = NULL;
+    char *old_isodir = NULL;
     char cfg_file[100];
     t_bkptype media_specified_by_user;
@@ -1046 +1047 @@
             /* We need to override prefix value in PXE mode as it's 
              * already done in start-nfs */
+            if (tmp = getenv("imgname") == 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,getenv("imgname"));
+                    strcpy(bkpinfo->prefix,tmp);
             }
 
@@ -1160 +1164 @@
         /* We need to override values in PXE mode as it's 
          * already done in start-nfs */
+        if (tmp = getenv("nfsmount") == NULL) {
+            fatal_error("no nfsmount variable in environment");
+        }
+        if (tmp1 = getenv("dirimg") == 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,getenv("nfsmount"));
-                strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));
+                strcpy(bkpinfo->nfs_mount,tmp);
+                strcpy(bkpinfo->nfs_remote_dir,tmp1);
             }
     } else if (bkpinfo->backup_media_type == iso) {