rpms/udev/devel start_udev,1.72,1.73 udev.spec,1.241,1.242

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20229

Modified Files:
	start_udev udev.spec 
Log Message:
* Sat Apr 05 2008 Harald Hoyer <harald at redhat.com> 120-2
- removed warning about deprecated /lib/udev/devices (rhbz#440961)
- replaced /usr/bin/find with shell find function (rhbz#440961)



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- start_udev	17 Mar 2008 18:09:38 -0000	1.72
+++ start_udev	5 Apr 2008 16:29:16 -0000	1.73
@@ -133,7 +133,7 @@
 		pushd $devdir &> "$udev_root/null"
 		set *
 		if [ "$1" != "*" ]; then
-			echo "Warning: $devdir is deprecated. Please use /etc/udev/makedev.d/."
+			#echo "Warning: $devdir is deprecated. Please use /etc/udev/makedev.d/."
         		cp -ar "$@" $udev_root/ 
 			pushd "$udev_root" &> "$udev_root/null"
 			[ -x /sbin/restorecon ] && /sbin/restorecon "$@" 
@@ -150,6 +150,14 @@
 	fi
 }
 
+findalias () {
+	local n
+	for n in "$1"/* ; do
+		[ -h "$n" ] && continue
+		[ -d "$n" ] && { findalias "$n" ; continue; }
+		[ "${n##*/}" == "modalias" ] && echo $(cat $n)
+	done
+}
 
 wait_for_queue() {
         local timeout=${1:-0}
@@ -256,10 +264,11 @@
 	if strstr "$cmdline" modprobedebug; then
 		/sbin/udevcontrol env MODPROBE_OPTIONS="-s -v -q"
 		echo
-		for i in $(find /sys -name modalias); do 
-		    modules=$(cat $i)
-		    modprobe -a -v -q $modules 
-		    wait_for_queue $udevtimeout
+		findalias /sys | while read modules ; do
+			if [ -n "$modules" ]; then
+				/sbin/modprobe -a -v -q $modules
+				wait_for_queue $udevtimeout
+			fi
 		done
 		echo "Triggering Rest"
 	fi


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- udev.spec	4 Apr 2008 13:35:38 -0000	1.241
+++ udev.spec	5 Apr 2008 16:29:16 -0000	1.242
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 120
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -401,6 +401,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Sat Apr 05 2008 Harald Hoyer <harald at redhat.com> 120-2
+- removed warning about deprecated /lib/udev/devices (rhbz#440961)
+- replaced /usr/bin/find with shell find function (rhbz#440961)
+
 * Fri Apr 04 2008 Harald Hoyer <harald at redhat.com> 120-1
 - version 120