qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 16:43:09 +02:00
Code

package/dropbear: use new service wrapper

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28838 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-07 22:58:50 +00:00
parent 4097f52f4c
commit c9adf56187
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/dropbear/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear PKG_NAME:=dropbear
PKG_VERSION:=0.53.1 PKG_VERSION:=0.53.1
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \

30
package/dropbear/files/dropbear.init
View File

@ -2,10 +2,13 @@
# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2006 Carlos Sobrinho # Copyright (C) 2006 Carlos Sobrinho
NAME=dropbear
PROG=/usr/sbin/dropbear
START=50 START=50
STOP=50 STOP=50
SERVICE_USE_PID=1
NAME=dropbear
PROG=/usr/sbin/dropbear
PIDCOUNT=0 PIDCOUNT=0
EXTRA_COMMANDS="killclients" EXTRA_COMMANDS="killclients"
EXTRA_HELP=" killclients Kill ${NAME} processes except servers and yourself" EXTRA_HELP=" killclients Kill ${NAME} processes except servers and yourself"
@ -48,7 +51,8 @@ dropbear_start()
PIDCOUNT="$(( ${PIDCOUNT} + 1))" PIDCOUNT="$(( ${PIDCOUNT} + 1))"
# prepare parameters (initialise with pid file) # prepare parameters (initialise with pid file)
local args="-P /var/run/${NAME}.${PIDCOUNT}.pid" local pid_file="/var/run/${NAME}.${PIDCOUNT}.pid"
local args="-P $pid_file"
local val local val
# A) password authentication # A) password authentication
config_get_bool val "${section}" PasswordAuth 1 config_get_bool val "${section}" PasswordAuth 1
@ -80,8 +84,7 @@ dropbear_start()
# execute program and return its exit code # execute program and return its exit code
[ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}" [ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"
${PROG} ${args} SERVICE_PID_FILE="$pid_file" service_start ${PROG} ${args}
return $?
} }
keygen() keygen()
@ -120,14 +123,17 @@ start()
stop() stop()
{ {
# killing all server processes local pid_file pid_files
local pidfile
for pidfile in `ls /var/run/${NAME}.*.pid` pid_files=`ls /var/run/${NAME}.*.pid 2>/dev/null`
do
start-stop-daemon -q -K -s KILL -p "${pidfile}" -n "${NAME}" [ -z "$pid_files" ] && return 1
rm -f "${pidfile}"
for pid_file in $pid_files; do
SERVICE_PID_FILE="$pid_file" service_stop ${PROG} && {
rm -f ${pid_file}
}
done done
[ -z "${pidfile}" ] && echo "${initscript}: no pid files, if you get problems with start then try killclients"
} }
killclients() killclients()