hotplug2 update - include hotplug2-init.rules from hotplug2.rules, fix permissions...

[openwrt.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 ed5e7d8..aff47cf 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -2,29 +2,57 @@
 # Copyright (C) 2006 OpenWrt.org
 
 START=10
+
+system_config() {
+       local cfg="$1"
+       local hostname
+       
+       config_get hostname "$cfg" hostname
+       echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+
+       config_get conloglevel "$cfg" conloglevel
+       [ -n "$conloglevel" ] && dmesg -n "$conloglevel"
+
+       config_get log_ip "$cfg" log_ip 
+       syslogd -C16 ${log_ip:+-L -R $log_ip}
+       klogd
+}
+
+apply_uci_config() {(
+       include /lib/config
+       uci_apply_defaults
+)}
+
 start() {
        [ -f /proc/mounts ] || /sbin/mount_root
        [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
        vconfig set_name_type DEV_PLUS_VID_NO_PAD
-       
-       HOSTNAME=${wan_hostname%%.*}
-       echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
+
+       apply_uci_config
+       config_load system
+       config_foreach system_config system
        
        mkdir -p /var/run
        mkdir -p /var/log
        mkdir -p /var/lock
+       mkdir -p /var/state
        touch /var/log/wtmp
        touch /var/log/lastlog
-       ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+       ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
-       
-       # manually trigger hotplug before loading modules
+
+       /sbin/hotplug2 --override --persistent --max-children 1 &
+
+       # 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 &
-       echo /sbin/hotplug-call > /proc/sys/kernel/hotplug
+       # 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/*
 }