Changeset 133 in MondoRescue for trunk

Timestamp:

Nov 22, 2005, 7:06:13 PM (19 years ago)

Author:

bcornec

Message:

merge -r130:132 $SVN_M/branches/2.05

Location:

trunk/mondo

Files:

• ChangeLog (modified) (1 diff)
• mondo/common/libmondo-devices.c (modified) (2 diffs)

trunk/mondo/ChangeLog

@@ -1 +1 @@
 MONDO CHANGES
 
+- now handles cifs correctly
 
 v2.05_berlios (Bruno Cornec <bcornec@users.berlios.de)

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

@@ -2184 +2184 @@
     strcpy(exclude_these_directories,
            call_program_and_get_last_line_of_output
-           ("mount -t coda,ncpfs,nfs,smbfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     strcpy(exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     sprintf(result_sz, "%s %s", exclude_these_directories,
             exclude_these_devices);
@@ -2214 +2214 @@
     strcpy(exclude_these_directories,
            call_program_and_get_last_line_of_output
-           ("mount -t coda,ncpfs,nfs,smbfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     strcpy(exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     sprintf(result_sz, "%s", exclude_these_directories);
     paranoid_free(exclude_these_devices);