rpms/udev/devel start_udev,1.42,1.43 udev.spec,1.124,1.125

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32097

Modified Files:
	start_udev udev.spec 
Log Message:
refined start_udev for old kernels


Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- start_udev	14 Nov 2005 17:42:04 -0000	1.42
+++ start_udev	21 Nov 2005 07:25:27 -0000	1.43
@@ -191,9 +191,8 @@
 
 event_replay () {
 	# generate events with the sysfs trigger
-	list=$(echo /sys/bus/*/devices/*/uevent)
-	list="$list $(echo /sys/class/*/*/uevent)"
-	list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
+	list="$(find_f /sys/bus uevent) $(find_f /sys/class uevent) $(find_f /sys/block uevent)"
+
 	for i in $list; do
 		case "$i" in
 		*/device/uevent)
@@ -212,9 +211,9 @@
 		esac
 	done
 
-	# trigger the sorted events
-	set $first $default $last
-	if [ $# -gt 1 ]; then
+	if [ -n "$first" -o -n "$default" -o -n "$last" ]; then
+		# trigger the sorted events
+		set $first $default $last
 		echo -e '\000' > /proc/sys/kernel/hotplug
 		for i in $@; do
 			echo "add" > "$i"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- udev.spec	15 Nov 2005 11:22:23 -0000	1.124
+++ udev.spec	21 Nov 2005 07:25:27 -0000	1.125
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 075
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -303,6 +303,9 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Fri Nov 18 2005 Harald Hoyer <harald at redhat.com> - 075-3
+- refined start_udev for old kernels
+
 * Fri Nov 11 2005 Harald Hoyer <harald at redhat.com> - 075-2
 - moved /etc/udev/scripts to /lib/udev
 - moved /etc/udev/devices to /lib/udev/devices