swconfig: fix vlan/port configs being applied to all switches

[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 2ed4c50..346d60d 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -2,6 +2,7 @@
 # Copyright (C) 2006 OpenWrt.org
 
 START=10
 # Copyright (C) 2006 OpenWrt.org
 
 START=10

+STOP=98

 
 system_config() {
        local cfg="$1"
 
 system_config() {
        local cfg="$1"


@@ -18,6 +19,9 @@ system_config() {
        config_get timezone "$cfg" timezone 'UTC'
        echo "$timezone" > /tmp/TZ
 
        config_get timezone "$cfg" timezone 'UTC'
        echo "$timezone" > /tmp/TZ
 

+       config_get zonename "$cfg" zonename
+       [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && ln -s "/usr/share/zoneinfo/$zonename" /tmp/localtime
+

        if [ -x /sbin/syslogd ]; then
                local log_ip log_size log_port log_type log_file
                config_get log_ip "$cfg" log_ip 
        if [ -x /sbin/syslogd ]; then
                local log_ip log_size log_port log_type log_file
                config_get log_ip "$cfg" log_ip 


@@ -26,9 +30,13 @@ system_config() {
                config_get log_type "$cfg" log_type circular
                config_get log_file "$cfg" log_file "/var/log/messages"
                if [ "$log_type" = "file" ]; then
                config_get log_type "$cfg" log_type circular
                config_get log_file "$cfg" log_file "/var/log/messages"
                if [ "$log_type" = "file" ]; then

-                       syslogd -s $log_size -O $log_file ${log_ip:+-L -R ${log_ip}:${log_port}} -S
+                       syslogd -s $log_size -O $log_file \
+                               ${log_ip:+-L -R ${log_ip}:${log_port}} \
+                               ${conloglevel:+-l $conloglevel} -S

                else
                else

-                       syslogd -C${log_size} ${log_ip:+-L -R ${log_ip}:${log_port}}
+                       syslogd -C${log_size} \
+                               ${log_ip:+-L -R ${log_ip}:${log_port}} \
+                               ${conloglevel:+-l $conloglevel}

                fi
        fi
        config_get klogconloglevel "$cfg" klogconloglevel
                fi
        fi
        config_get klogconloglevel "$cfg" klogconloglevel


@@ -73,10 +81,20 @@ start() {
        done
 
        # create /dev/root if it doesn't exist
        done
 
        # create /dev/root if it doesn't exist

-       [ -e /dev/root ] || {
+       [ -e /dev/root -o -h /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/*
                rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
                [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
        }
 
        load_modules /etc/modules.d/*

+
+       # another round of USB coldplugging to kick devices into operation which lacked drivers before
+       for dev in /sys/bus/usb/devices/*/uevent; do
+               [ -e "$dev" ] && echo -n add > "$dev"
+       done

 }
 }

+
+stop() {
+        killall -9 syslogd 2> /dev/null
+}
+