aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-01-12 21:45:30 +0000
committerBill Nottingham <notting@redhat.com>2005-01-12 21:45:30 +0000
commit0a86b60f1c8a40e9171e6f7fd87ce338b1fbd42a (patch)
tree771e6757c355198fc4e127e52a1b19428f5a063d
parentb458cb71e6ed9e598eeb390d51f6d4ec6425fbc4 (diff)
downloadinitscripts-0a86b60f1c8a40e9171e6f7fd87ce338b1fbd42a.tar
initscripts-0a86b60f1c8a40e9171e6f7fd87ce338b1fbd42a.tar.gz
initscripts-0a86b60f1c8a40e9171e6f7fd87ce338b1fbd42a.tar.bz2
initscripts-0a86b60f1c8a40e9171e6f7fd87ce338b1fbd42a.tar.xz
initscripts-0a86b60f1c8a40e9171e6f7fd87ce338b1fbd42a.zip
use udevsend to handle hotplug events, conflict with inappropriate
udev versions
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/rc.sysinit2
2 files changed, 2 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index fcbef560..247efdf5 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -20,7 +20,7 @@ Requires: ethtool >= 1.8-2, kernel >= 2.6, /sbin/nash, /sbin/runuser
Conflicts: mkinitrd < 4.0
Conflicts: timeconfig < 3.0, ppp < 2.3.9, wvdial < 1.40-3
Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
-Conflicts: udev < 0:032
+Conflicts: udev < 0:048
Conflicts: tcsh < 6.13-5
Obsoletes: rhsound sapinit
Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 48284c1b..236df880 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -128,7 +128,7 @@ cmdline=$(cat /proc/cmdline)
if [ -f /proc/sys/kernel/modprobe ]; then
if ! strstr "$cmdline" nomodules && [ -f /proc/modules ] ; then
sysctl -w kernel.modprobe="/sbin/modprobe" >/dev/null 2>&1
- sysctl -w kernel.hotplug="/sbin/hotplug" >/dev/null 2>&1
+ sysctl -w kernel.hotplug="/sbin/udevsend" >/dev/null 2>&1
else
# We used to set this to NULL, but that causes 'failed to exec' messages"
sysctl -w kernel.modprobe="/bin/true" >/dev/null 2>&1