rpms/udev/devel start_udev,1.96,1.97 udev.spec,1.322,1.323

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5376

Modified Files:
	start_udev udev.spec 
Log Message:
* Tue Jul 20 2010 Harald Hoyer <harald at redhat.com> 160-7
- turn off hotplug in /sys/kernel/uevent_helper or /proc/sys/kernel/hotplug



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- start_udev	25 Jun 2010 13:33:19 -0000	1.96
+++ start_udev	20 Jul 2010 11:31:27 -0000	1.97
@@ -47,6 +47,15 @@ STRING=$"Starting $prog: "
 # propagate /dev from /sys
 echo -n "$STRING"
 
+# turn off hotplug binary calling
+if ! [ -x /sbin/hotplug ]; then
+	if [ -e /sys/kernel/uevent_helper ]; then
+		echo -e '\000\000\000\000' > /sys/kernel/uevent_helper
+	elif [ -e /proc/sys/kernel/hotplug ]; then
+		echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+	fi
+fi
+
 /sbin/udevd -d
 
 ret=$[$ret + $?]


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- udev.spec	15 Jul 2010 06:32:02 -0000	1.322
+++ udev.spec	20 Jul 2010 11:31:27 -0000	1.323
@@ -7,7 +7,7 @@
 Summary: A rule-based device node and kernel event manager
 Name: udev
 Version: 160
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -348,6 +348,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Tue Jul 20 2010 Harald Hoyer <harald at redhat.com> 160-7
+- turn off hotplug in /sys/kernel/uevent_helper or /proc/sys/kernel/hotplug
+
 * Thu Jul 15 2010 Harald Hoyer <harald at redhat.com> 160-6
 - add versioned requires for libudev to udev