diff options
author | Johan Hovold <johan@kernel.org> | 2014-10-24 17:39:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 10:27:10 +0000 |
commit | 56fa8cdbf1a59872d98b7baa8e8bd28e9d36ddd8 (patch) | |
tree | 1c36288fdef250795ddc24f6ce02350820fac1e8 /meta/recipes-core/udev | |
parent | 7e8ca6fb182d5a04bec9adcafc2c108c50c1955f (diff) | |
download | poky-56fa8cdbf1a59872d98b7baa8e8bd28e9d36ddd8.tar.gz |
udev: fix uevent-helper disable
Make sure that /proc/sys/kernel/hotplug exists before trying to disable
the uevent-helper mechanism.
Since kernel commit 86d56134f1b6 ("kobject: Make support for
uevent_helper optional.") the kernel can be built without uevent-helper
support. In this case /proc/sys/kernel/hotplug does not exist and the
current sysvinit script fails with
/etc/rcS.d/S04udev: line 132: can't create /proc/sys/kernel/hotplug: nonexistent directory
when trying to disable the uevent-helper mechanism during boot.
Note that a single NULL-character has always been sufficient to disable.
(From OE-Core rev: f7b8445f2e89ad0a59c2859f9eb26855769f1070)
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev')
-rw-r--r-- | meta/recipes-core/udev/udev/init | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init index 96bd774d24..d26cbfca96 100644 --- a/meta/recipes-core/udev/udev/init +++ b/meta/recipes-core/udev/udev/init | |||
@@ -99,7 +99,7 @@ case "$1" in | |||
99 | kill_udevd > "/dev/null" 2>&1 | 99 | kill_udevd > "/dev/null" 2>&1 |
100 | 100 | ||
101 | # trigger the sorted events | 101 | # trigger the sorted events |
102 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug | 102 | [ -e /proc/sys/kernel/hotplug ] && echo -e '\000' >/proc/sys/kernel/hotplug |
103 | @UDEVD@ -d | 103 | @UDEVD@ -d |
104 | 104 | ||
105 | udevadm control --env=STARTUP=1 | 105 | udevadm control --env=STARTUP=1 |