X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/101062e0813248080d9bf1baa14ae06af0042df4..85545a1d5a01821af290e54c7efbfc05d5a1d6f7:/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 aff47cfc7..ba918f310 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -5,17 +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 'UTC' + echo "$timezone" > /tmp/TZ + local log_ip log_size log_port config_get log_ip "$cfg" log_ip - syslogd -C16 ${log_ip:+-L -R $log_ip} - klogd + 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() {( @@ -26,7 +33,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 +43,19 @@ 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 + touch /tmp/resolv.conf.auto ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf [ "$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