aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2014-10-24 17:39:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-04 10:19:55 +0000
commitf7b8445f2e89ad0a59c2859f9eb26855769f1070 (patch)
tree815037ae8ff6598fe0df5b7d09c8fa8194e6bfda
parent666c6a126cd12d2555361f5b573b6a26437df780 (diff)
downloadopenembedded-core-contrib-f7b8445f2e89ad0a59c2859f9eb26855769f1070.tar.gz
openembedded-core-contrib-f7b8445f2e89ad0a59c2859f9eb26855769f1070.tar.bz2
openembedded-core-contrib-f7b8445f2e89ad0a59c2859f9eb26855769f1070.zip
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. Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/udev/udev/init2
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
kill_udevd > "/dev/null" 2>&1
# trigger the sorted events
- echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+ [ -e /proc/sys/kernel/hotplug ] && echo -e '\000' >/proc/sys/kernel/hotplug
@UDEVD@ -d
udevadm control --env=STARTUP=1