aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2011-11-07 22:58:39 +0000
committerNicolas Thill <nico@openwrt.org>2011-11-07 22:58:39 +0000
commite4a8f5abe631ca557c95456eae1dfe131cee75c0 (patch)
tree17bbea5ad50ee45e8a1c4b4caa64d05573a7d4b6
parent93886bc77667952afa306863c766cad00821074e (diff)
downloadupstream-e4a8f5abe631ca557c95456eae1dfe131cee75c0.tar.gz
upstream-e4a8f5abe631ca557c95456eae1dfe131cee75c0.tar.bz2
upstream-e4a8f5abe631ca557c95456eae1dfe131cee75c0.zip
package/busybox: use new service wrapper
SVN-Revision: 28836
-rw-r--r--package/busybox/Makefile2
-rwxr-xr-xpackage/busybox/files/cron9
-rwxr-xr-xpackage/busybox/files/telnet6
3 files changed, 9 insertions, 8 deletions
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
}
-