summaryrefslogtreecommitdiff
path: root/meta/packages/udev
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-21 12:15:23 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-21 12:15:23 +0000
commit4b647cde776260b809da5254aea1038dd5d865a3 (patch)
treeadd800cc33bce8e10786dab9f58e6c4b2aaa1db4 /meta/packages/udev
parentb3b8d9ed94ea6cc713a4a0831bc3d5693c44429e (diff)
downloadopenembedded-core-4b647cde776260b809da5254aea1038dd5d865a3.tar.gz
openembedded-core-4b647cde776260b809da5254aea1038dd5d865a3.tar.bz2
openembedded-core-4b647cde776260b809da5254aea1038dd5d865a3.zip
Various minor updates from OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@919 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/udev')
-rwxr-xr-xmeta/packages/udev/files/init8
-rw-r--r--meta/packages/udev/udev-092/udev.rules2
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/packages/udev/files/init b/meta/packages/udev/files/init
index 1022b40c89..8cbab188f0 100755
--- a/meta/packages/udev/files/init
+++ b/meta/packages/udev/files/init
@@ -138,7 +138,7 @@ if [ ! -d /sys/class/ ]; then
exit 1
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
echo "udev requires hotplug support, not started."
exit 1
fi
@@ -161,7 +161,11 @@ case "$1" in
warn_if_interactive
#echo /sbin/udevsend > /proc/sys/kernel/hotplug
- echo "" > /proc/sys/kernel/hotplug
+ if [ -e /sys/kernel/uevent_helper ] ; then
+ echo "" > /sys/kernel/uevent_helper
+ else
+ echo "" > /proc/sys/kernel/hotplug
+ fi
udevsend
if [ "$UDEV_DISABLED" = "yes" ]; then
echo "udev disabled on the kernel command line, not started."
diff --git a/meta/packages/udev/udev-092/udev.rules b/meta/packages/udev/udev-092/udev.rules
index c1834a9a1c..72be706e84 100644
--- a/meta/packages/udev/udev-092/udev.rules
+++ b/meta/packages/udev/udev-092/udev.rules
@@ -98,5 +98,5 @@ KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
# Samsung UARTS
-KERNEL=="s3c2410_serial[0-9]" NAME="ttySAC%n"
+KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n"