From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 7 Aug 2009 00:07:51 +0000 (+0000)
Subject: base-files: port init.d/boot to new config_get
X-Git-Tag: reboot~22731
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2892e2f1d5b2d040b30625a3c4718b09463436fe;p=oweals%2Fopenwrt.git

base-files: port init.d/boot to new config_get

... and localize some variables.

Signed-off-by: Malte S. Stretz <mss@apache.org>

SVN-Revision: 17157
---

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 283c02a1ae..ba918f3109 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -5,22 +5,23 @@ 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 
-	[ -z "$timezone" ] && timezone=UTC
+	config_get timezone "$cfg" timezone 'UTC'
 	echo "$timezone" > /tmp/TZ
 
+	local log_ip log_size log_port
 	config_get log_ip "$cfg" log_ip 
-	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}}
+	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
 }