aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-07-11 17:00:26 +0000
committerJohn Crispin <john@openwrt.org>2013-07-11 17:00:26 +0000
commite3a61156866e29e4da8ec2897b7b5819b080d932 (patch)
tree3e791ba7c18955ddcba26bbf62d60a486a565ae5 /package
parent06ae364c3d918dc5f347e21003b0a121b954fb56 (diff)
downloadupstream-e3a61156866e29e4da8ec2897b7b5819b080d932.tar.gz
upstream-e3a61156866e29e4da8ec2897b7b5819b080d932.tar.bz2
upstream-e3a61156866e29e4da8ec2897b7b5819b080d932.zip
busybox: convert telnet init script to procd
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 37242
Diffstat (limited to 'package')
-rwxr-xr-xpackage/utils/busybox/files/telnet13
1 files changed, 7 insertions, 6 deletions
diff --git a/package/utils/busybox/files/telnet b/package/utils/busybox/files/telnet
index 994e713e70..8ffd904078 100755
--- a/package/utils/busybox/files/telnet
+++ b/package/utils/busybox/files/telnet
@@ -2,6 +2,9 @@
# Copyright (C) 2006-2011 OpenWrt.org
START=50
+USE_PROCD=1
+PROG=/usr/sbin/telnetd
+NAME=telnetd
has_root_pwd() {
local pwd=$([ -f "$1" ] && cat "$1")
@@ -23,15 +26,13 @@ has_ssh_pubkey() {
( /etc/init.d/sshd enabled 2> /dev/null && grep -qs "^ssh-" "$(get_root_home /etc/passwd)"/.ssh/authorized_keys )
}
-start() {
+start_service() {
if ( ! has_ssh_pubkey && \
! 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
- service_start /usr/sbin/telnetd -l /bin/login.sh
+ procd_open_instance
+ procd_set_param command "$PROG" -F -l /bin/login.sh
+ procd_close_instance
fi
}
-
-stop() {
- service_stop /usr/sbin/telnetd
-}