X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Finit.d%2Fboot;h=2ed4c50613c5e2ac32d3380fdb021e5f41cd8557;hp=ba918f3109abf57b7ae04b5b064025f00831cb2e;hb=daa59b7513eb66b7c184474ea188fda4dd4a4aee;hpb=8a855b152e9eb7c802b3b7ca65f6414eb39540ec

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index ba918f310..2ed4c5061 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -12,23 +12,32 @@ system_config() {
 	echo "$hostname" > /proc/sys/kernel/hostname
 
 	config_get conloglevel "$cfg" conloglevel
-	[ -n "$conloglevel" ] && dmesg -n "$conloglevel"
+	config_get buffersize "$cfg" buffersize
+	[ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
 	
 	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 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
+	if [ -x /sbin/syslogd ]; then
+		local log_ip log_size log_port log_type log_file
+		config_get log_ip "$cfg" log_ip 
+		config_get log_size "$cfg" log_size 16
+		config_get log_port "$cfg" log_port 514
+		config_get log_type "$cfg" log_type circular
+		config_get log_file "$cfg" log_file "/var/log/messages"
+		if [ "$log_type" = "file" ]; then
+			syslogd -s $log_size -O $log_file ${log_ip:+-L -R ${log_ip}:${log_port}} -S
+		else
+			syslogd -C${log_size} ${log_ip:+-L -R ${log_ip}:${log_port}}
+		fi
+	fi
+	config_get klogconloglevel "$cfg" klogconloglevel
+	[ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel}
 }
 
-apply_uci_config() {(
-	include /lib/config
-	uci_apply_defaults
-)}
+apply_uci_config() {
+	sh -c '. /etc/functions.sh; include /lib/config; uci_apply_defaults'
+}
 
 start() {
 	[ -f /proc/mounts ] || /sbin/mount_root
@@ -49,6 +58,7 @@ start() {
 	touch /var/log/lastlog
 	touch /tmp/resolv.conf.auto
 	ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
+	grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug
 	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
 	killall -q hotplug2