dropbear: Name pid file by uci section name

Name the pidfile of each dropbear instance according to the
corresponding uci section name. This enables a 1:1 mapping between the
definition of the service instance and its process.

Signed-off-by: Andreas Gnau <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/15177
Signed-off-by: John Crispin <[email protected]>

diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init
index 395237f9bc206a716f4130d3e83746311d7e5031..11e89340db3092e113210d77c006ecae2ed94f4f 100755 (executable)
--- a/package/network/services/dropbear/files/dropbear.init
+++ b/package/network/services/dropbear/files/dropbear.init
@@ -8,7 +8,6 @@ STOP=50
 USE_PROCD=1
 PROG=/usr/sbin/dropbear
 NAME=dropbear
-PIDCOUNT=0
 
 extra_command "killclients" "Kill ${NAME} processes except servers and yourself"
 
@@ -298,8 +297,7 @@ dropbear_instance()
                break
        done
 
-       PIDCOUNT="$(( ${PIDCOUNT} + 1))"
-       local pid_file="/var/run/${NAME}.${PIDCOUNT}.pid"
+       local pid_file="/var/run/${NAME}.${1}.pid"
 
        procd_open_instance
        procd_set_param command "$PROG" -F -P "$pid_file"