diff options
| -rwxr-xr-x | packages/udev/files/init | 8 | ||||
| -rw-r--r-- | packages/udev/udev-058/init | 2 | ||||
| -rw-r--r-- | packages/udev/udev-063/init | 2 | ||||
| -rw-r--r-- | packages/udev/udev-065/init | 2 | ||||
| -rw-r--r-- | packages/udev/udev-084/init | 8 | ||||
| -rw-r--r-- | packages/udev/udev-089/init | 8 |
6 files changed, 21 insertions, 9 deletions
diff --git a/packages/udev/files/init b/packages/udev/files/init index 1022b40c89..8cbab188f0 100755 --- a/packages/udev/files/init +++ b/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/packages/udev/udev-058/init b/packages/udev/udev-058/init index 16efb31542..a213463ad2 100644 --- a/packages/udev/udev-058/init +++ b/packages/udev/udev-058/init @@ -23,7 +23,7 @@ if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then exit 0 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 0 fi diff --git a/packages/udev/udev-063/init b/packages/udev/udev-063/init index 16efb31542..67886c9e54 100644 --- a/packages/udev/udev-063/init +++ b/packages/udev/udev-063/init @@ -23,7 +23,7 @@ if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then exit 0 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 0 fi diff --git a/packages/udev/udev-065/init b/packages/udev/udev-065/init index 16efb31542..67886c9e54 100644 --- a/packages/udev/udev-065/init +++ b/packages/udev/udev-065/init @@ -23,7 +23,7 @@ if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then exit 0 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 0 fi diff --git a/packages/udev/udev-084/init b/packages/udev/udev-084/init index 5a60d52a9a..e20e881e2a 100644 --- a/packages/udev/udev-084/init +++ b/packages/udev/udev-084/init @@ -84,7 +84,11 @@ set_hotplug_handler() { case "$(uname -r)" in 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;; esac - echo $HANDLER > /proc/sys/kernel/hotplug + if [ -e /sys/kernel/uevent_helper ] ; then + echo $HANDLER > /sys/kernel/uevent_helper + else + echo $HANDLER > /proc/sys/kernel/hotplug + fi } # shell version of /usr/bin/tty @@ -145,7 +149,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 diff --git a/packages/udev/udev-089/init b/packages/udev/udev-089/init index 5a60d52a9a..e20e881e2a 100644 --- a/packages/udev/udev-089/init +++ b/packages/udev/udev-089/init @@ -84,7 +84,11 @@ set_hotplug_handler() { case "$(uname -r)" in 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;; esac - echo $HANDLER > /proc/sys/kernel/hotplug + if [ -e /sys/kernel/uevent_helper ] ; then + echo $HANDLER > /sys/kernel/uevent_helper + else + echo $HANDLER > /proc/sys/kernel/hotplug + fi } # shell version of /usr/bin/tty @@ -145,7 +149,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 |