summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2010-07-19 13:08:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-15 13:05:27 +0000
commit5da2485717b1a32c7a880e500a4251c67ef713ea (patch)
treeafbe1a27502f43636b8894ea6820e958636abb15
parentc677b7c5c3b5801f387eb098531d35498a631889 (diff)
downloadpoky-5da2485717b1a32c7a880e500a4251c67ef713ea.tar.gz
poky-5da2485717b1a32c7a880e500a4251c67ef713ea.tar.bz2
poky-5da2485717b1a32c7a880e500a4251c67ef713ea.zip
dropbear: use pidfile for daemon start/stop/restart
Old init script killed all dropbear processes when doing stop/restart including open SSH sessions which is very annoying. (From OE-Core rev: 97aa5ac2df7593e343d82f5e64a422bb951eacf9) Signed-off-by: Roman I Khimov <khimov@altell.ru> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-core/dropbear/dropbear/init9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/init b/meta/recipes-core/dropbear/dropbear/init
index 5cc2d656e8..e8fed3f94d 100755
--- a/meta/recipes-core/dropbear/dropbear/init
+++ b/meta/recipes-core/dropbear/dropbear/init
@@ -15,6 +15,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/dropbear
NAME=dropbear
DESC="Dropbear SSH server"
+PIDFILE=/var/run/dropbear.pid
DROPBEAR_PORT=22
DROPBEAR_EXTRA_ARGS=
@@ -80,24 +81,24 @@ case "$1" in
KEY_ARGS=""
test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
- start-stop-daemon -S \
+ start-stop-daemon -S -p $PIDFILE \
-x "$DAEMON" -- $KEY_ARGS \
-p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
- start-stop-daemon -K -x "$DAEMON"
+ start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
echo "$NAME."
;;
restart|force-reload)
echo -n "Restarting $DESC: "
- start-stop-daemon -K -x "$DAEMON"
+ start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
sleep 1
KEY_ARGS=""
test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
- start-stop-daemon -S \
+ start-stop-daemon -S -p $PIDFILE \
-x "$DAEMON" -- $KEY_ARGS \
-p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
echo "$NAME."