Changeset 871 in MondoRescue

Timestamp:

Oct 4, 2006, 10:56:43 AM (18 years ago)

Author:

Bruno Cornec

Message:

TMPDIR used in common-env
Avoid mixing affectation and comparison on same line in mondo-rstr-tools.c
(Still looking for a Seg Fault in mondorestore in PXE mode)

Location:

branches/stable

Files:

• mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• tools/common-env (modified) (1 diff)

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

@@ -1047 +1047 @@
             /* We need to override prefix value in PXE mode as it's 
              * already done in start-nfs */
-            if (tmp = getenv("imgname") == NULL) {
+            tmp = getenv("imgname");
+            if (tmp == NULL) {
                 fatal_error("no imgname variable in environment");
             }
@@ -1164 +1165 @@
         /* We need to override values in PXE mode as it's 
          * already done in start-nfs */
-        if (tmp = getenv("nfsmount") == NULL) {
+        tmp = getenv("nfsmount");
+        if (tmp == NULL) {
             fatal_error("no nfsmount variable in environment");
         }
-        if (tmp1 = getenv("dirimg") == NULL) {
+        tmp1 = getenv("dirimg");
+        if (tmp1 == NULL) {
             fatal_error("no dirimg variable in environment");
         }

branches/stable/tools/common-env

@@ -11 +11 @@
 mkdir -p ${TOPDIR}
 export TMPDIR=/tmp
-export TMP=`mktemp -d /tmp/mondobuild.XXXXXXXXXX`
+export TMP=`mktemp -d $TMPDIR/mondobuild.XXXXXXXXXX`
 
 umask 022