rpms/udev/devel start_udev,1.53,1.54 udev.spec,1.173,1.174

[fedora-cvs-commits at redhat.com]

Author: harald

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

Modified Files:
	start_udev udev.spec 
Log Message:
- added option to debug udev with kernel cmdline option "udevdebug"



Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- start_udev	19 Apr 2006 11:44:47 -0000	1.53
+++ start_udev	6 Jul 2006 07:17:43 -0000	1.54
@@ -149,13 +149,24 @@
 	
 	ret=$[$ret + $?]
 }
+
+# returns OK if $1 contains $2
+strstr() {
+  [ "${1#*$2*}" = "$1" ] && return 1
+  return 0
+}
+
 make_extra_nodes
+cmdline=$(cat /proc/cmdline)
 kill_udevd > "$udev_root/null" 2>&1
 if [ -f "/sys/class/tty/console/uevent" ]; then
 	# trigger the sorted events
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 	/sbin/udevd -d
 	ret=$[$ret + $?]
+	if strstr "$cmdline" debugudev; then
+		/sbin/udevcontrol log_priority=debug
+	fi
 	/sbin/udevtrigger
 	ret=$[$ret + $?]
 	wait_for_queue


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- udev.spec	5 Jul 2006 11:50:02 -0000	1.173
+++ udev.spec	6 Jul 2006 07:17:43 -0000	1.174
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -325,6 +325,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Jul  6 2006 Harald Hoyer <harald at redhat.com> - 095-2
+- added option to debug udev with kernel cmdline option "udevdebug"
+
 * Wed Jul  5 2006 Harald Hoyer <harald at redhat.com> - 095-1
 - version 095