Changeset 2443 in MondoRescue

Timestamp:

Sep 29, 2009, 8:43:38 PM (15 years ago)

Author:

Bruno Cornec

Message:

• priority given to env var for tmpdir
• fuse FS excluded from tmpdir computation

Location:

branches/2.2.9/mondo/src/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-devices.c

@@ -2756 +2756 @@
     mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x fuse -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 

branches/2.2.9/mondo/src/common/libmondo-tools.c

@@ -776 +776 @@
     }
 
-    if (path != NULL) {
-        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
-    } else if (getenv("TMPDIR")) {
+    /* Always take in account env first */
+    if (getenv("TMPDIR")) {
         mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
     } else if (getenv("TMP")) {
         mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
+    } else if (path != NULL) {
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
     } else {
         mr_asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");