rpms/hal/devel hal-0.5.7-fix-for-nfs-and-autofs.patch, NONE, 1.1 hal.spec, 1.92, 1.93

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21556

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.7-fix-for-nfs-and-autofs.patch 
Log Message:
- Add patch that makes hald not stat nfs and autofs mounts



hal-0.5.7-fix-for-nfs-and-autofs.patch:
 blockdev.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

--- NEW FILE hal-0.5.7-fix-for-nfs-and-autofs.patch ---
--- hal-0.5.7/hald/linux2/blockdev.c.fix_for_nfs_and_autofs	2006-05-17 13:50:00.000000000 -0400
+++ hal-0.5.7/hald/linux2/blockdev.c	2006-05-17 14:01:32.000000000 -0400
@@ -205,6 +205,21 @@
 	while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
 		struct stat statbuf;
 
+		/* If this is a nfs mount or autofs 
+		 * (fstype == 'nfs' || fstype == 'autofs') 
+		 * ignore the mount. Reason:
+		 *  1. we don't list nfs devices in HAL
+  		 *  2. more problematic: stat on mountpoints with 
+		 *     'stale nfs handle' never come
+  		 *     back and block complete HAL and all applications 
+		 *     using HAL fail.
+		 *  3. autofs and HAL butt heads causing drives to never
+		 *     be unmounted
+  		 */
+		if (strcmp(mnt.mnt_type, "nfs") == 0 ||
+		    strcmp(mnt.mnt_type, "autofs") == 0)
+			continue;
+
 		/* check the underlying device of the mount point */
 		if (stat (mnt.mnt_dir, &statbuf) != 0)
 			continue;


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- hal.spec	15 May 2006 13:45:42 -0000	1.92
+++ hal.spec	17 May 2006 18:08:07 -0000	1.93
@@ -20,12 +20,13 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 8 
+Release: 9 
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Patch0: hal-0.5.7-fix-fedora-power-save.patch
 Patch1: hal-0.5.7-lid-open-fix.patch
+Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -94,6 +95,7 @@
 %setup -q
 %patch -p0 -b .fix-fedora-powersave
 %patch1 -p1 -b .lid-open-fix
+%patch2 -p1 -b .fix-for-nfs-and-autofs
 
 %build
 
@@ -199,6 +201,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Wed May 17 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-9
+- Add patch that makes hald not stat nfs and autofs mounts
+
 * Mon May 15 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-8
 - Patch from Brian Pepple <bdpepple at ameritech.net> Add BR for dbus-glib