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
commit1f70c9f44ac14499540f15e03d7eda0567c6695a (patch)
tree8441ed43e67381c8d9a21bbaf9c7509de86fc3db
parent4725d80d4d6296769243d4696f5797b60c2582f1 (diff)
downloadupstream-1f70c9f44ac14499540f15e03d7eda0567c6695a.tar.gz
upstream-1f70c9f44ac14499540f15e03d7eda0567c6695a.tar.bz2
upstream-1f70c9f44ac14499540f15e03d7eda0567c6695a.zip
move syslogd and klogd to init.di/boot script, add remote logging support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7160 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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