[oe-commits] Roman I Khimov : dropbear: use pidfile for daemon start/stop/restart
git at git.openembedded.org
git at git.openembedded.org
Fri Feb 15 15:31:23 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 97aa5ac2df7593e343d82f5e64a422bb951eacf9
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=97aa5ac2df7593e343d82f5e64a422bb951eacf9
Author: Roman I Khimov <khimov at altell.ru>
Date: Mon Jul 19 13:08:08 2010 +0000
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.
Signed-off-by: Roman I Khimov <khimov at altell.ru>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/dropbear/dropbear/init | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/dropbear/dropbear/init b/meta/recipes-core/dropbear/dropbear/init
index 5cc2d65..e8fed3f 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."
More information about the Openembedded-commits
mailing list