[package] base-files: fix sysupgrade get_magic_word() function to return proper value...

[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 57c034e..ba918f3 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -5,22 +5,24 @@ START=10
 
 system_config() {
        local cfg="$1"
 
 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 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
 
        echo "$timezone" > /tmp/TZ
 

+       local log_ip log_size log_port

        config_get log_ip "$cfg" log_ip 
        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_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() {(
 }
 
 apply_uci_config() {(


@@ -42,14 +44,18 @@ 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 \
        [ -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
 
        # 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