base-files: port init.d/boot to new config_get

[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 c7038f5f3005622037ee8b9c5d12c76d25e34950..ba918f3109abf57b7ae04b5b064025f00831cb2e 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -5,26 +5,24 @@ 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 timezone "$cfg" timezone 
-       [ -z "$timezone" ] && timezone=UTC
+       config_get timezone "$cfg" timezone 'UTC'
        echo "$timezone" > /tmp/TZ
 
-       config_get log_ip "$cfg" log_ip
-       config_get log_size "$cfg" log_size
-       config_get log_file "$cfg" log_file
-       # use a shared mem buffer for local default
-       [ -z $log_file -a -z "$log_size" ] && log_size=16
-       syslogd ${log_size:+-C $log_size} ${log_file:+-O $log_file} \
-               ${log_ip:+-L -R $log_ip}
-       klogd
+       local log_ip log_size log_port
+       config_get log_ip "$cfg" log_ip 
+       config_get log_size "$cfg" log_size 16
+       config_get log_port "$cfg" log_port 514
+       [ -x /sbin/syslogd ] && syslogd -C${log_size} ${log_ip:+-L -R ${log_ip}:${log_port}}
+       [ -x /sbin/klogd ] && klogd
 }
 
 apply_uci_config() {(
@@ -37,24 +35,27 @@ start() {
        [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
        [ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
 
+       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
        mkdir -p /tmp/.uci
-
-       apply_uci_config
-       config_load system
-       config_foreach system_config system
-
-       chown 0700 /tmp/.uci
+       chmod 0700 /tmp/.uci
        touch /var/log/wtmp
        touch /var/log/lastlog
+       touch /tmp/resolv.conf.auto
        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
+       killall -q hotplug2
        [ -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