rpms/coreutils/devel coreutils-df-cifs.patch, NONE, 1.1 coreutils.spec, 1.142, 1.143

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27020

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-df-cifs.patch 
Log Message:
* Tue Sep 12 2006 Tim Waugh <twaugh at redhat.com>
- Ignore 'cifs' filesystems for 'df -l' (bug #183703).

coreutils-df-cifs.patch:
 mountlist.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE coreutils-df-cifs.patch ---
--- coreutils-5.97/lib/mountlist.c.df-cifs	2006-09-12 11:19:18.000000000 +0100
+++ coreutils-5.97/lib/mountlist.c	2006-09-12 11:20:28.000000000 +0100
@@ -152,12 +152,13 @@
 
 #ifndef ME_REMOTE
 /* A file system is `remote' if its Fs_name contains a `:'
-   or if (it is of type smbfs and its Fs_name starts with `//').  */
+   or if (it is of type smbfs or cifs and its Fs_name starts with `//').  */
 # define ME_REMOTE(Fs_name, Fs_type)		\
     (strchr (Fs_name, ':') != 0			\
      || ((Fs_name)[0] == '/'			\
 	 && (Fs_name)[1] == '/'			\
-	 && strcmp (Fs_type, "smbfs") == 0))
+	 && (strcmp (Fs_type, "smbfs") == 0     \
+             || strcmp (Fs_type, "cifs") == 0)))
 #endif
 
 #if MOUNTED_GETMNTINFO


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- coreutils.spec	11 Sep 2006 16:16:03 -0000	1.142
+++ coreutils.spec	12 Sep 2006 10:38:16 -0000	1.143
@@ -27,6 +27,7 @@
 Patch100: coreutils-chgrp.patch
 Patch107: fileutils-4.1.10-timestyle.patch
 Patch182: coreutils-acl.patch
+Patch183: coreutils-df-cifs.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -85,6 +86,7 @@
 %patch100 -p1 -b .chgrp
 %patch107 -p1 -b .timestyle
 %patch182 -p1 -b .acl
+%patch183 -p1 -b .df-cifs
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -280,7 +282,8 @@
 /sbin/runuser
 
 %changelog
-* Mon Sep 11 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Sep 12 2006 Tim Waugh <twaugh at redhat.com>
+- Ignore 'cifs' filesystems for 'df -l' (bug #183703).
 - Include -g/-G in runuser man page (part of bug #199344).
 - Corrected runuser man page (bug #200620).