package/base-files: use new service wrapper

SVN-Revision: 28835

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 03016ba4c1b215c57fbd69a50dbbe9858c7dc91d..530d2ca35b6011030445d00c98f3c3f1a406a727 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=86
+PKG_RELEASE:=87
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 7f6b26791bb191ca4f11765b069f26edb38621ef..44b53fe27ae8ca0aa8435e27b87c3a1d987ae5b8 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=10
 STOP=98
@@ -23,24 +23,25 @@ system_config() {
        [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && ln -s "/usr/share/zoneinfo/$zonename" /tmp/localtime
 
        if [ -x /sbin/syslogd ]; then
-               local log_ip log_size log_port log_type log_file
+               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
-                       syslogd -s $log_size -O $log_file \
-                               ${log_ip:+-L -R ${log_ip}:${log_port}} \
-                               ${conloglevel:+-l $conloglevel} -S
+                       args="$args -s $log_size -O $log_file -S"
                else
-                       syslogd -C${log_size} \
-                               ${log_ip:+-L -R ${log_ip}:${log_port}} \
-                               ${conloglevel:+-l $conloglevel}
+                       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
-       config_get klogconloglevel "$cfg" klogconloglevel
-       [ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel}
 }
 
 apply_uci_config() {
@@ -101,6 +102,6 @@ start() {
 }
 
 stop() {
-        killall -9 syslogd 2> /dev/null
+       service_stop /sbin/klogd
+       service_stop /sbin/syslogd
 }
-

diff --git a/package/base-files/files/etc/init.d/sysntpd b/package/base-files/files/etc/init.d/sysntpd
index fefb48fb19ee510850e8c912f89249867eb8e0a7..aa35da83134d154cca042d8b68a9c6f5116aae9b 100755 (executable)
--- a/package/base-files/files/etc/init.d/sysntpd
+++ b/package/base-files/files/etc/init.d/sysntpd
@@ -3,11 +3,12 @@
 
 START=98
 
-BIN=/usr/sbin/ntpd
-PID=/var/run/sysntpd.pid
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+SERVICE_PID_FILE=/var/run/sysntpd.pid
 
 start() {
-       [ -x $BIN ] || exit 0
+       [ -x $PROG ] || return 1
 
        local peers
 
@@ -25,11 +26,10 @@ start() {
                        append args "-p $peer"
                done
 
-               start-stop-daemon -x $BIN -m -p $PID -b -S -- $args
+               service_start /usr/sbin/ntpd $args
        fi
 }
 
 stop() {
-       service_kill ${BIN##*/} $PID
-       rm -f $PID
+       service_stop /usr/sbin/ntpd
 }

diff --git a/package/base-files/files/etc/init.d/watchdog b/package/base-files/files/etc/init.d/watchdog
index 65a45e53f23602fb633aba277984649b7e9ccec5..299c891428cc93e90054064cdced18bfcc6a9681 100755 (executable)
--- a/package/base-files/files/etc/init.d/watchdog
+++ b/package/base-files/files/etc/init.d/watchdog
@@ -1,12 +1,13 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2010 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 
 START=97
+
 start() {
-        [ -c /dev/watchdog ] && [ -x /sbin/watchdog ] && \
-               watchdog -t 5 /dev/watchdog
+       [ -c /dev/watchdog ] || return 1
+       [ -x /sbin/watchdog ] || return 1
+       service_start /sbin/watchdog -t 5 /dev/watchdog
 }
-
 stop() {
-       killall -q watchdog
+       service_stop /sbin/watchdog
 }