make basefiles aware of procd

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36003

3 files changed, 4 insertions, 66 deletions

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 005c4ad6f8..67db0d2a6a 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -24,27 +24,6 @@ system_config() {
 
 	# apply timezone to kernel
 	date -k
-
-	if [ -x /sbin/syslogd ]; then
-		local args 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"
-		args="${log_ip:+-L -R ${log_ip}:${log_port}} ${conloglevel:+-l $conloglevel}"
-		if [ "$log_type" = "file" ]; then
-			args="$args -s $log_size -O $log_file -S"
-		else
-			args="$args -C${log_size}"
-		fi
-		service_start /sbin/syslogd $args
-	fi
-	if [ -x /sbin/klogd ]; then
-		config_get klogconloglevel "$cfg" klogconloglevel
-		args="${klogconloglevel:+-c $klogconloglevel}"
-		service_start /sbin/klogd $args
-	fi
 }
 
 apply_uci_config() {
@@ -84,12 +63,6 @@ start() {
 	config_load system
 	config_foreach system_config system
 
-	killall -q hotplug2
-	[ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
-			--set-rules-file /etc/hotplug2.rules \
-			--set-coldplug-cmd /sbin/udevtrigger \
-			--max-children 1 >/dev/null 2>&1 &
-
 	# create /dev/root if it doesn't exist
 	[ -e /dev/root -o -h /dev/root ] || {
 		rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
@@ -103,8 +76,3 @@ start() {
 		done
 	fi
 }
-
-stop() {
-	service_stop /sbin/klogd
-	service_stop /sbin/syslogd
-}
diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS
index 3ec9bfef6e..9599bbf32e 100755
--- a/package/base-files/files/etc/init.d/rcS
+++ b/package/base-files/files/etc/init.d/rcS
@@ -1,26 +1,9 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
-run_scripts() {
-	for i in /etc/rc.d/$1*; do
-		[ -x $i ] && $i $2 2>&1
-	done | $LOGGER
-}
-
-system_config() {
-	config_get_bool foreground $1 foreground 0
-}
-
 LOGGER="cat"
-[ -x /usr/bin/logger ] && LOGGER="logger -s -p 6 -t sysinit"
-
-. /lib/functions.sh
-
-config_load system
-config_foreach system_config system
+[ -x /usr/bin/logger ] && LOGGER="logger -p 6 -t sysinit"
 
-if [ "$1" = "S" -a "$foreground" != "1" ]; then
-	run_scripts "$1" "$2" &
-else
-	run_scripts "$1" "$2"
-fi
+for i in /etc/rc.d/$1*; do
+	[ -x $i ] && $i $2 2>&1
+done | $LOGGER
diff --git a/package/base-files/files/etc/init.d/watchdog b/package/base-files/files/etc/init.d/watchdog
deleted file mode 100755
index 299c891428..0000000000
--- a/package/base-files/files/etc/init.d/watchdog
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
-
-START=97
-
-start() {
-	[ -c /dev/watchdog ] || return 1
-	[ -x /sbin/watchdog ] || return 1
-	service_start /sbin/watchdog -t 5 /dev/watchdog
-}
-stop() {
-	service_stop /sbin/watchdog
-}