rpms/udev/F-8 start_udev,1.67,1.68 udev.spec,1.228,1.229

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28844

Modified Files:
	start_udev udev.spec 
Log Message:
* Wed May 07 2008 Harald Hoyer <harald at redhat.com> 118-2
- added better modprobedebug



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-8/start_udev,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- start_udev	10 Jan 2008 12:11:44 -0000	1.67
+++ start_udev	7 May 2008 08:05:55 -0000	1.68
@@ -117,6 +117,15 @@
 	done
 }
 
+findalias () {
+	local n
+	for n in "$1"/* ; do
+		[ -h "$n" ] && continue
+		[ -d "$n" ] && { findalias "$n" ; continue; }
+		[ "${n##*/}" == "modalias" ] && echo $(cat $n)
+	done
+}
+
 kill_udevd() {
 	if [ -x /sbin/pidof ]; then
 		pid=`/sbin/pidof -x udevd`
@@ -201,9 +210,6 @@
 	/sbin/udevd -d
 	ret=$[$ret + $?]
 
-	if strstr "$cmdline" modprobedebug; then
-		/sbin/udevcontrol env MODPROBE_OPTIONS="-s -v -q"
-	fi
 	if strstr "$cmdline" udevdebug; then
 		/sbin/udevcontrol log_priority=debug
 	fi
@@ -217,6 +223,18 @@
 		/sbin/udevcontrol max_childs_running=$(getval udevchilds $cmdline)
 	fi
 
+	if strstr "$cmdline" modprobedebug; then
+		/sbin/udevcontrol env MODPROBE_OPTIONS="-s -v -q"
+		echo
+		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
+
         /sbin/udevcontrol env STARTUP=1
 	/sbin/udevtrigger
 	ret=$[$ret + $?]


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-8/udev.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- udev.spec	10 Jan 2008 12:11:44 -0000	1.228
+++ udev.spec	7 May 2008 08:05:55 -0000	1.229
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 118
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -364,6 +364,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed May 07 2008 Harald Hoyer <harald at redhat.com> 118-2
+- added better modprobedebug
+
 * Tue Jan 08 2008 Harald Hoyer <harald at redhat.com> 118-1
 - version 118
 - removed old USB compat rule (rhbz#424331)