X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Finit.d%2Fboot;h=85064248e4222e56095d3104e7ac0801af176969;hp=02519fbbc77a9f1110b52d190f5eb1970d6cab7a;hb=24a050b0050e64c16b18a32a9deee69b4944d9f0;hpb=6e9391d0f5b00d5c565b9b3212e82f1b3b210617 diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 02519fbbc7..85064248e4 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -12,10 +12,16 @@ system_config() { 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 - syslogd -C16 ${log_ip:+-L -R $log_ip} - klogd + config_get log_size "$cfg" log_size + 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() {( @@ -26,7 +32,7 @@ apply_uci_config() {( 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 +42,17 @@ 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 [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe - - /sbin/hotplug2 --persistent --max-children 1 & + + killall -q hotplug2 + [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \ + --max-children 1 --no-coldplug & # 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