Changeset 2104 in MondoRescue
- Timestamp:
- Jan 6, 2009, 3:33:45 PM (16 years ago)
- Location:
- branches/2.2.8/mondo/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.8/mondo/src/common/libmondo-devices.c
r2101 r2104 1073 1073 } 1074 1074 strip_spaces(good_formats); 1075 strcat(good_formats, " swap lvm raid ntfs 7 "); // " ntfs 7 " -- um, cheating much? :)1075 strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 "); // " ntfs 7 " -- um, cheating much? :) 1076 1076 if (strstr(good_formats, format_sz)) { 1077 1077 retval = 1; … … 2201 2201 strcpy(tmp, 2202 2202 call_program_and_get_last_line_of_output 2203 ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs, smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));2203 ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'")); 2204 2204 #else 2205 2205 strcpy(tmp, 2206 2206 call_program_and_get_last_line_of_output 2207 ("LANGUAGE=C df -m -P -x nfs -x nfs4 -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol| 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;}'"));2207 ("LANGUAGE=C df -m -P -x nfs -x nfs4 -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| 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;}'")); 2208 2208 #endif 2209 2209 -
branches/2.2.8/mondo/src/common/libmondo-filelist.c
r2100 r2104 1650 1650 log_msg(2, "include_paths = '%s'", include_paths); 1651 1651 log_msg(1, "Calculating filelist"); 1652 asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs| fat|vfat|dos' | awk '{print $3}'"));1652 asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'")); 1653 1653 if (strlen(tmp2) < 1) { 1654 1654 asprintf(&tmp1," "); -
branches/2.2.8/mondo/src/include/my-stuff.h
r2101 r2104 312 312 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE "/dev/vinum/" 313 313 #define RAID_DEVICE_STUB DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE 314 #define SANE_FORMATS "swap image msdosfs nfs ntfs raid lvm ffs ufs ext2fs"314 #define SANE_FORMATS "swap image msdosfs nfs ntfs ntfs-3g raid lvm ffs ufs ext2fs" 315 315 #define ALT_TAPE "/dev/ast0" 316 316 #define MKE2FS_OR_NEWFS "newfs" … … 322 322 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE "/dev/md" 323 323 #define RAID_DEVICE_STUB DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE 324 #define SANE_FORMATS "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda nfs nfs4 ntfs hpfs raid lvm cifs ocfs ocfs2"324 #define SANE_FORMATS "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2" 325 325 #define ALT_TAPE "/dev/ht0" 326 326 #define MKE2FS_OR_NEWFS "mke2fs"
Note:
See TracChangeset
for help on using the changeset viewer.