use hotplug2 for serializing hotplug events on 2.6

[openwrt/svn-archive/archive.git] / package / base-files / files / etc / init.d / boot

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 8850311829ec42232b08e90ecd90fbc09102d733..d5a42e2d7efef24cc1e983cf5ffe16305618f813 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -27,13 +27,17 @@ start() {
        ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
        
-       # manually trigger hotplug before loading modules
+       # the coldplugging of network interfaces needs to happen later, so we do it manually here
        for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
                /usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug-call net
        done
-       
-       /sbin/hotplug2 --persistent --max-children 5 &
-       echo /sbin/hotplug-call > /proc/sys/kernel/hotplug
+       /sbin/hotplug2 --persistent --max-children 1 &
+
+       # create /dev/root if it doesn't exist
+       [ -e /dev/root ] || {
+               rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
+               [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
+       }
 
        load_modules /etc/modules.d/*
 }