extend logging functions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17514 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index ba918f3109abf57b7ae04b5b064025f00831cb2e..3da0d6bc94a6b843e4e343ad47688dea2278d628 100755 (executable)
--- 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() {(