ar71xx: add an id argument to ar71xx_add_device_mdio

[openwrt.git] / package / dropbear / files / dropbear.init

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index aa7e07d..c909d28 100755 (executable)
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -2,16 +2,40 @@
 # Copyright (C) 2006-2010 OpenWrt.org
 # Copyright (C) 2006 Carlos Sobrinho
 
-NAME=dropbear
-PROG=/usr/sbin/dropbear
 START=50
 STOP=50
+
+SERVICE_USE_PID=1
+
+NAME=dropbear
+PROG=/usr/sbin/dropbear
 PIDCOUNT=0
 EXTRA_COMMANDS="killclients"
 EXTRA_HELP="   killclients Kill ${NAME} processes except servers and yourself"
 
 dropbear_start()
 {
+       append_ports()
+       {
+               local ifname="$1"
+               local port="$2"
+
+               grep -qs "^ *$ifname:" /proc/net/dev || {
+                       append args "-p $port"
+                       return
+               }
+
+               for addr in $(
+                       ifconfig "$ifname" | sed -ne '
+                               /addr: *fe[89ab][0-9a-f]:/d
+                               s/.* addr: *\([0-9a-f:\.]*\).*/\1/p
+                       '
+               ); do
+                       append args "-p $addr:$port"
+               done
+       }
+
+
        local section="$1"
 
        # check if section is enabled (default)
@@ -27,19 +51,19 @@ dropbear_start()
        PIDCOUNT="$(( ${PIDCOUNT} + 1))"
 
        # 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
        # A) password authentication
        config_get_bool val "${section}" PasswordAuth 1
        [ "${val}" -eq 0 ] && append args "-s"
        # B) listen interface and port
+       local port
        local interface
-       local address
        config_get interface "${section}" Interface
-       config_get address "${interface}" ipaddr
-       config_get val "${section}" Port
-       val="${address:+${address}:}${val}"
-       [ -n "${val}" ] && append args "-p ${val}"
+       config_get interface "${interface}" ifname "$interface"
+       config_get port "${section}" Port 22
+       append_ports "$interface" "$port"
        # C) banner file
        config_get val "${section}" BannerFile
        [ -f "${val}" ] && append args "-b ${val}"
@@ -60,8 +84,7 @@ dropbear_start()
 
        # execute program and return its exit code
        [ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"
-       ${PROG} ${args}
-       return $?
+       SERVICE_PID_FILE="$pid_file" service_start ${PROG} ${args}
 }
 
 keygen()
@@ -100,14 +123,17 @@ start()
 
 stop()
 {
-       # killing all server processes
-       local pidfile
-       for pidfile in `ls /var/run/${NAME}.*.pid`
-        do
-               start-stop-daemon -q -K -s KILL -p "${pidfile}" -n "${NAME}"
-               rm -f "${pidfile}"
+       local pid_file pid_files
+       
+       pid_files=`ls /var/run/${NAME}.*.pid 2>/dev/null`
+       
+       [ -z "$pid_files" ] && return 1
+       
+       for pid_file in $pid_files; do
+               SERVICE_PID_FILE="$pid_file" service_stop ${PROG} && {
+                       rm -f ${pid_file}
+               }
        done
-       [ -z "${pidfile}" ] && echo "${initscript}: no pid files, if you get problems with start then try killclients"
 }
 
 killclients()