cleanup MTD option handling
[openwrt.git] / package / base-files / files / etc / init.d / boot
index c7038f5..12226be 100755 (executable)
@@ -17,14 +17,11 @@ system_config() {
        [ -z "$timezone" ] && timezone=UTC
        echo "$timezone" > /tmp/TZ
 
        [ -z "$timezone" ] && timezone=UTC
        echo "$timezone" > /tmp/TZ
 
-       config_get log_ip "$cfg" log_ip
+       config_get log_ip "$cfg" log_ip 
        config_get log_size "$cfg" log_size
        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
+       config_get log_port "$cfg" log_port
+       [ -x /sbin/syslogd ] && syslogd -C${log_size:-16} ${log_ip:+-L -R $log_ip${log_port:+:$log_port}}
+       [ -x /sbin/klogd ] && klogd
 }
 
 apply_uci_config() {(
 }
 
 apply_uci_config() {(
@@ -37,24 +34,25 @@ start() {
        [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
        [ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
 
        [ -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
        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 /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
 
        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
        [ "$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 &
+                       --max-children 1 --no-coldplug >/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
This page took 0.022895 seconds and 4 git commands to generate.