Support configurations without syslogd/klogd.

[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 5f5ca99..8506424 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -12,11 +12,16 @@ system_config() {
 
        config_get conloglevel "$cfg" conloglevel
        [ -n "$conloglevel" ] && dmesg -n "$conloglevel"
 
        config_get conloglevel "$cfg" conloglevel
        [ -n "$conloglevel" ] && dmesg -n "$conloglevel"

+       
+       config_get timezone "$cfg" timezone 
+       [ -z "$timezone" ] && timezone=UTC
+       echo "$timezone" > /tmp/TZ

 
        config_get log_ip "$cfg" log_ip 
        config_get log_size "$cfg" log_size
 
        config_get log_ip "$cfg" log_ip 
        config_get log_size "$cfg" log_size

-       syslogd -C${log_size:-16} ${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() {(


@@ -27,7 +32,7 @@ apply_uci_config() {(
 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


@@ -38,12 +43,14 @@ 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
        [ "$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 \
                        --max-children 1 --no-coldplug &
 
        [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
                        --max-children 1 --no-coldplug &