move the hotplug2 kill command from preinit to /etc/init.d/boot, so that it works...

[openwrt.git] / package / base-files / files / etc / preinit

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index ddbb2f3..810558c 100755 (executable)
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -29,11 +29,16 @@ if grep devfs /proc/filesystems > /dev/null; then
        M1=/dev/pty/m1
        HOTPLUG=/sbin/hotplug-call
 
        M1=/dev/pty/m1
        HOTPLUG=/sbin/hotplug-call
 

-elif [ -x /sbin/hotplug ]; then
+elif [ -x /sbin/hotplug2 ]; then

        mount -t tmpfs tmpfs /dev -o size=512K
        mknod /dev/console c 5 1
        mount -t tmpfs tmpfs /dev -o size=512K
        mknod /dev/console c 5 1

-       /sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
-       /sbin/hotplug2 --no-coldplug --persistent --set-rules-file /etc/hotplug2-init.rules &
+       if [ -n "$INITRAMFS" ]; then
+               /sbin/hotplug2 --coldplug --no-persistent --max_children 1
+               /sbin/hotplug2 --persistent --max_children 1 &
+       else
+               /sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
+               /sbin/hotplug2 --no-coldplug --persistent --set-rules-file /etc/hotplug2-init.rules &
+       fi

        M0=/dev/ptmx
        M1=/dev/ptmx
        HOTPLUG=
        M0=/dev/ptmx
        M1=/dev/ptmx
        HOTPLUG=


@@ -82,6 +87,5 @@ if [ -z "$INITRAMFS" ]; then
 
        echo "- init -"
        
 
        echo "- init -"
        

-       killall hotplug2

        exec /sbin/init
 fi
        exec /sbin/init
 fi