[package] base-files: retrigger usb coldplug after module loading, solves usb_modeswi...

[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 0b77447..357ae3f 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -2,31 +2,48 @@
 # 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"

-       local hostname
-       
-       config_get hostname "$cfg" hostname
-       echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+
+       local hostname conloglevel timezone
+
+       config_get hostname "$cfg" hostname 'OpenWrt'
+       echo "$hostname" > /proc/sys/kernel/hostname

 
        config_get conloglevel "$cfg" conloglevel
 
        config_get conloglevel "$cfg" conloglevel

-       [ -n "$conloglevel" ] && dmesg -n "$conloglevel"
+       config_get buffersize "$cfg" buffersize
+       [ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
+       
+       config_get timezone "$cfg" timezone 'UTC'
+       echo "$timezone" > /tmp/TZ

 
 

-       config_get log_ip "$cfg" log_ip 
-       syslogd -C16 ${log_ip:+-L -R $log_ip}
-       klogd
+       if [ -x /sbin/syslogd ]; then
+               local log_ip log_size log_port log_type log_file
+               config_get log_ip "$cfg" log_ip 
+               config_get log_size "$cfg" log_size 16
+               config_get log_port "$cfg" log_port 514
+               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
+               else
+                       syslogd -C${log_size} ${log_ip:+-L -R ${log_ip}:${log_port}}
+               fi
+       fi
+       config_get klogconloglevel "$cfg" klogconloglevel
+       [ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel}

 }
 
 }
 

-apply_uci_config() {(
-       include /lib/config
-       uci_apply_defaults
-)}
+apply_uci_config() {
+       sh -c '. /etc/functions.sh; include /lib/config; uci_apply_defaults'
+}

 
 start() {
        [ -f /proc/mounts ] || /sbin/mount_root
        [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
 
 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
+       [ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD

 
        apply_uci_config
        config_load system
 
        apply_uci_config
        config_load system


@@ -37,14 +54,19 @@ start() {
        mkdir -p /var/lock
        mkdir -p /var/state
        mkdir -p /tmp/.uci
        mkdir -p /var/lock
        mkdir -p /var/state
        mkdir -p /tmp/.uci

-       chown 0700 /tmp/.uci
+       chmod 0700 /tmp/.uci

        touch /var/log/wtmp
        touch /var/log/lastlog
        touch /var/log/wtmp
        touch /var/log/lastlog

+       touch /tmp/resolv.conf.auto

        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf

+       grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug

        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 

+       killall -q hotplug2

        [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
        [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \

-                       --max-children 1 --no-coldplug &
+                       --set-worker /lib/hotplug2/worker_fork.so \
+                       --set-rules-file /etc/hotplug2.rules \
+                       --max-children 1 >/dev/null 2>&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
 
        # 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


@@ -52,10 +74,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
+}
+