summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-09-04 21:09:13 +0000
committerthepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-09-04 21:09:13 +0000
commita7ad6546eafca05ef80e50a7c1477c53f83a5c23 (patch)
tree4ee878c0c9eff342662037af79b19ca83a70e246
parent50d18d731409a9b68e4663e2f29bf91f21ed9de5 (diff)
extend logging functions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17514 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot24
1 files changed, 17 insertions, 7 deletions
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index ba918f310..3da0d6bc9 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -12,17 +12,27 @@ 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() {(