rpms/hotplug/devel hotplug-2004_09_23-firmwaresys.patch, NONE, 1.1 hotplug.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/hotplug/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11418

Modified Files:
	hotplug.spec 
Added Files:
	hotplug-2004_09_23-firmwaresys.patch 
Log Message:
fix firmware.agent (#143067)


hotplug-2004_09_23-firmwaresys.patch:
 firmware.agent |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hotplug-2004_09_23-firmwaresys.patch ---
--- hotplug-2004_09_23/etc/hotplug/firmware.agent.foo	2005-04-27 12:37:21.000000000 -0400
+++ hotplug-2004_09_23/etc/hotplug/firmware.agent	2005-04-27 12:37:46.000000000 -0400
@@ -23,7 +23,7 @@
 FIRMWARE_DIR=/lib/firmware
 
 # mountpoint of sysfs
-SYSFS=$(sed -n 's/^.* \([^ ]*\) sysfs .*$/\1/p' /proc/mounts)
+SYSFS=$(awk '$3 == "sysfs" { print $2 ; nextfile }' /proc/mounts)
 
 # use /proc for 2.4 kernels
 if [ "$SYSFS" = "" ]; then


Index: hotplug.spec
===================================================================
RCS file: /cvs/dist/rpms/hotplug/devel/hotplug.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hotplug.spec	29 Mar 2005 18:48:41 -0000	1.27
+++ hotplug.spec	27 Apr 2005 16:42:28 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A helper application which loads modules for USB devices.
 Name: hotplug
 Version: 2004_09_23
-Release: 4
+Release: 5
 Epoch: 3
 Group: System Environment/Kernel
 License: GPL
@@ -31,6 +31,9 @@
 # Call ifdown on interface unregister
 Patch2: hotplug-ifdown.patch
 
+# Don't freak if there are multiple /sys
+Patch3: hotplug-2004_09_23-firmwaresys.patch
+
 # We don't include initscript, don't reference it in the man page
 Patch5: hotplug-2003_08_05-initfile.patch
 
@@ -64,6 +67,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
@@ -133,6 +137,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 27 2005 Bill Nottingham <notting at redhat.com> 3:2004_09_23-5
+- fix firmware agent for the presence of two sysfs directories (#143067)
+
 * Tue Mar 29 2005 Bill Nottingham <notting at redhat.com> 3:2004_09_23-4
 - remove obsolete usbutils requirement