Changeset 787


Ignore:
Timestamp:
Sep 13, 2006, 2:51:47 PM (13 years ago)
Author:
bruno
Message:

AFS support added

Location:
branches/stable/mondo
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/ChangeLog

    r744 r787  
    22
    33MONDO CHANGES
     4
     52.2.0 (2006-09-05)
    46
    572.0.9 (2006-08-04)
  • branches/stable/mondo/mondo/common/libmondo-devices.c

    r702 r787  
    24332433    strcpy(exclude_these_directories,
    24342434           call_program_and_get_last_line_of_output
    2435            ("mount -t coda,ncpfs,nfs,smbfs,cifs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2435           ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
    24362436    strcpy(exclude_these_devices,
    24372437           call_program_and_get_last_line_of_output
    2438            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2438           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
    24392439    sprintf(result_sz, "%s %s", exclude_these_directories,
    24402440            exclude_these_devices);
     
    24632463    strcpy(exclude_these_directories,
    24642464           call_program_and_get_last_line_of_output
    2465            ("mount -t coda,ncpfs,nfs,smbfs,cifs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2465           ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
    24662466    strcpy(exclude_these_devices,
    24672467           call_program_and_get_last_line_of_output
    2468            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2468           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
    24692469    sprintf(result_sz, "%s", exclude_these_directories);
    24702470    paranoid_free(exclude_these_devices);
     
    25252525    strcpy(tmp,
    25262526           call_program_and_get_last_line_of_output
    2527            ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
     2527           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
    25282528#else
    25292529    strcpy(tmp,
    25302530           call_program_and_get_last_line_of_output
    2531            ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -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;}'"));
     2531           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -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;}'"));
    25322532#endif
    25332533
  • branches/stable/mondo/mondo/common/libmondo-filelist.c

    r702 r787  
    15251525        // 2.6 has /sys as a proc-type thing -- must be excluded
    15261526        sprintf(tmp,
    1527                 "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
     1527                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
    15281528                dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
    15291529#else
    15301530        // On BSD, for example, /sys is the kernel sources -- don't exclude
    15311531        sprintf(tmp,
    1532                 "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
     1532                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
    15331533                dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
    15341534#endif
Note: See TracChangeset for help on using the changeset viewer.