Changeset 1655 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-devices.c

Timestamp:

Sep 25, 2007, 12:54:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix a bug where df was using locale to print messages and wasn't filtered correctly
Improve setup of tmpdir again

File:

• branches/2.2.5/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -2516 +2516 @@
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("LANGUAGE=C df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 
@@ -2531 +2531 @@
         fatal_error("I couldn't figure out the tempdir!");
     }
-    sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%d", tmp,
-            (int) (random() % 32768));
+    setup_tmpdir(tmp);
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);