Changeset 133 for trunk


Ignore:
Timestamp:
Nov 22, 2005, 7:06:13 PM (13 years ago)
Author:
bcornec
Message:

merge -r130:132 $SVN_M/branches/2.05

Location:
trunk/mondo
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/ChangeLog

    r129 r133  
    11MONDO CHANGES
    22
     3- now handles cifs correctly
    34
    45v2.05_berlios (Bruno Cornec <bcornec@users.berlios.de)
  • trunk/mondo/mondo/common/libmondo-devices.c

    r127 r133  
    21842184    strcpy(exclude_these_directories,
    21852185           call_program_and_get_last_line_of_output
    2186            ("mount -t coda,ncpfs,nfs,smbfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2186           ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
    21872187    strcpy(exclude_these_devices,
    21882188           call_program_and_get_last_line_of_output
    2189            ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2189           ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
    21902190    sprintf(result_sz, "%s %s", exclude_these_directories,
    21912191            exclude_these_devices);
     
    22142214    strcpy(exclude_these_directories,
    22152215           call_program_and_get_last_line_of_output
    2216            ("mount -t coda,ncpfs,nfs,smbfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2216           ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
    22172217    strcpy(exclude_these_devices,
    22182218           call_program_and_get_last_line_of_output
    2219            ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2219           ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
    22202220    sprintf(result_sz, "%s", exclude_these_directories);
    22212221    paranoid_free(exclude_these_devices);
Note: See TracChangeset for help on using the changeset viewer.