From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 7 Nov 2011 22:58:39 +0000 (+0000)
Subject: package/busybox: use new service wrapper
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e4a8f5abe631ca557c95456eae1dfe131cee75c0;p=openwrt%2Fstaging%2Fthess.git

package/busybox: use new service wrapper

SVN-Revision: 28836
---

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index a5f154820c..a6b6556052 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.19.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_FLAGS:=essential
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/busybox/files/cron b/package/busybox/files/cron
index 56348c84af..465b1ab45b 100755
--- a/package/busybox/files/cron
+++ b/package/busybox/files/cron
@@ -1,17 +1,18 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+SERVICE_USE_PID=1
 
 start () {
 	loglevel=$(uci_get "system.@system[0].cronloglevel")
 	[ -z "$(ls /etc/crontabs/)" ] && exit 1
 	mkdir -p /var/spool/cron
 	ln -s /etc/crontabs /var/spool/cron/ 2>/dev/null
-	crond -c /etc/crontabs -l ${loglevel:-5}
+	service_start /usr/sbin/crond -c /etc/crontabs -l ${loglevel:-5}
 }
 
 stop() {
-	killall -9 crond
+	service_stop /usr/sbin/crond
 }
diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index 88f8af9d75..334523eb9f 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -1,5 +1,6 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
 has_root_pwd() {
@@ -27,11 +28,10 @@ start() {
 	     ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
 	   ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
 	then
-		telnetd -l /bin/login.sh
+		service_start /usr/sbin/telnetd -l /bin/login.sh
 	fi
 }
 
 stop() {
-	killall telnetd 2>/dev/null
+	service_stop /usr/sbin/telnetd
 }
-