aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-05-10 09:29:55 +0000
committerMike Baker <mbm@openwrt.org>2007-05-10 09:29:55 +0000
commitfa0568fdcb41d3b3929f61acc1fb64fa9cd78a61 (patch)
treee1c6914093643457e7af00eb6f0f2cc82a8e1ddd
parent9a66abf108abb148a6fcb5b1f0a2e7ff4ca8c252 (diff)
downloadupstream-fa0568fdcb41d3b3929f61acc1fb64fa9cd78a61.tar.gz
upstream-fa0568fdcb41d3b3929f61acc1fb64fa9cd78a61.tar.bz2
upstream-fa0568fdcb41d3b3929f61acc1fb64fa9cd78a61.zip
move syslogd and klogd to init.di/boot script, add remote logging support
SVN-Revision: 7160
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot4
-rwxr-xr-xpackage/base-files/files/etc/init.d/rcS9
2 files changed, 4 insertions, 9 deletions
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index e586704a28..528d922a28 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -9,6 +9,10 @@ system_config() {
config_get hostname "$cfg" hostname
echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+
+ config_get log_ip "$cfg" log_ip
+ syslogd -C16 ${log_ip:+-L -R $log_ip}
+ klogd
}
apply_uci_config() {(
diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS
index 4e72bd905d..755e08b9c8 100755
--- a/package/base-files/files/etc/init.d/rcS
+++ b/package/base-files/files/etc/init.d/rcS
@@ -1,15 +1,6 @@
#!/bin/sh
# Copyright (C) 2006 OpenWrt.org
-${FAILSAFE:+exit}
-
-# FIXME: add logging configuration
-#[ -f /etc/config/network ] && . /etc/config/network
-#eval $(ipcalc "$log_ipaddr")
-#[ "$log_ipaddr" = "$IP" ] || log_ipaddr=""
-syslogd -C16 #${log_ipaddr:+-L -R $log_ipaddr}
-klogd
-
(
for i in /etc/rc.d/S*; do
$i boot 2>&1