Changeset 309 in MondoRescue for trunk/mondo/mondo/common/libmondo-devices.c

Timestamp:

Jan 13, 2006, 12:23:00 AM (18 years ago)

Author:

bcornec

Message:

merge -r303:308 $SVN_M/branches/2.06

File:

• trunk/mondo/mondo/common/libmondo-devices.c (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-devices.c

@@ -2066 +2066 @@
     asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif