do not start multiple subshells for applying /etc/uci-defaults. use sh -x for hush...

[openwrt-10.03/.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 0c31f1ce9e0798cadb48dbedaa772ff8e225a250..2ed4c50613c5e2ac32d3380fdb021e5f41cd8557 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -5,28 +5,44 @@ START=10
 
 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
-       [ -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
-       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
@@ -36,12 +52,20 @@ start() {
        mkdir -p /var/log
        mkdir -p /var/lock
        mkdir -p /var/state
+       mkdir -p /tmp/.uci
+       chmod 0700 /tmp/.uci
        touch /var/log/wtmp
        touch /var/log/lastlog
-       ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+       touch /tmp/resolv.conf.auto
+       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
 
-       /sbin/hotplug2 --override --persistent --max-children 1 &
+       killall -q hotplug2
+       [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
+                       --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