Various minor updates from OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@919 311d38ba-8fff-0310-9ca6-ca027cbcb966

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"