sysmo-bts
/
meta-sysmocom-bsp
9
1
Fork 0
Code Issues Pull Requests Releases Activity

dropbear: Do not kill client connections when restarting the daemon 

The upgrade of the unit broke due killing all client connections. opkg
got a SIGHUP and didn't write out the state files. Do not kill the
client connections on upgrade.
This commit is contained in:
Holger Hans Peter Freyther 2013-02-15 19:23:36 +01:00
parent cf29168330
commit e9379558e3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-fixes/dropbear/dropbear_sysmocom.inc
View File

@ -1,4 +1,4 @@
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:" FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
PRINC="3" PRINC="4"

9
recipes-fixes/dropbear/files/init
View File

@ -15,6 +15,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/dropbear DAEMON=/usr/sbin/dropbear
NAME=dropbear NAME=dropbear
DESC="Dropbear SSH server" DESC="Dropbear SSH server"
PIDFILE=/var/run/dropbear.pid
DROPBEAR_PORT=22 DROPBEAR_PORT=22
DROPBEAR_EXTRA_ARGS= DROPBEAR_EXTRA_ARGS=
@ -80,24 +81,24 @@ case "$1" in
KEY_ARGS="" KEY_ARGS=""
test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY" test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY" 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 \ -x "$DAEMON" -- $KEY_ARGS \
-p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
echo "$NAME." echo "$NAME."
;; ;;
stop) stop)
echo -n "Stopping $DESC: " echo -n "Stopping $DESC: "
start-stop-daemon -K -x "$DAEMON" start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
echo "$NAME." echo "$NAME."
;; ;;
restart|force-reload) restart|force-reload)
echo -n "Restarting $DESC: " echo -n "Restarting $DESC: "
start-stop-daemon -K -x "$DAEMON" start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
sleep 1 sleep 1
KEY_ARGS="" KEY_ARGS=""
test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY" test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY" 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 \ -x "$DAEMON" -- $KEY_ARGS \
-p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
echo "$NAME." echo "$NAME."