Changeset 2444 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

Timestamp:

Sep 30, 2009, 4:44:40 AM (15 years ago)

Author:

Bruno Cornec

Message:

• priority given to env var for tmpdir
• fuse FS excluded from tmpdir computation
• Improves udev timeout handling
• fuse device is needed at restore time for sshfs
• Avoids comment analysis in the new code handling deplist.d
• Avoids error message if some ssh conf files do not exist
• Improvements on sshfs/ssh management in restore mode
• Include now all minimal requirements for sshfs
• Fix udev support in init for Mandriva 2009.1 (udevadm settle is blocking)
• Improve deplist.d/* files
• adds libnss for ssh support in boot disk
• Solve a memory management issue in DSF module (strtok => mr_strtok)
• DSF now also supports partitions in addition to full disks
• Adds debug in open_and_list_dir
• Improve user management for NetFS cases
• ssh in the restore env needs some dlopened libs (libnss_compat|files)
• Warning emited in case of duplicate mountpoints or devices in fstab found
• Use only the AWK veriable everywhere and not the awk command
• Simplify GetInitrdFilesystemToUse which doesn't need to detect everything, but just know if it's initramfs (new mode) or a compressed FS ext2/3 (older mode) as initrd is anyway re-made by mindi. Should fix #353

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (1 diff)

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

@@ -742 +742 @@
     }
 
-    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");