From 8fefafee3ccceb6b07de24596a29ede0a5c0de06 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Apr 2019 15:10:19 +0200 Subject: [PATCH] restund: rely on procd for shutdown No need to stop restund manually. Just let procd handle it. Signed-off-by: Sebastian Kemper --- net/restund/files/restund.init | 52 ---------------------------------- 1 file changed, 52 deletions(-) diff --git a/net/restund/files/restund.init b/net/restund/files/restund.init index ee722ca..e899bc1 100644 --- a/net/restund/files/restund.init +++ b/net/restund/files/restund.init @@ -12,7 +12,6 @@ DEFAULT=/etc/default/$DAEMON LOGGER="/usr/bin/logger -p user.err -s -t $DAEMON" OPTIONS= PROG=/usr/sbin/$DAEMON -TIMEOUT=30 [ -f $DEFAULT ] && . $DEFAULT @@ -38,54 +37,3 @@ start_service() { procd_set_param user $DAEMON procd_close_instance } - -stop_service() { - local retval= - local mypid= - local timeout=$TIMEOUT - - pgrep $DAEMON &> /dev/null - [ $? -ne 0 ] && exit 0 - - [ -f /var/run/${DAEMON}.pid ] - retval=$? - - # init script could find itself in a scenario where restund was started - # very recently, so make it wait a while for a pid file to appear - while [ $retval -ne 0 -a $timeout -gt 0 ]; do - sleep 1 - [ -f /var/run/${DAEMON}.pid ] - retval=$? - timeout=$(($timeout-1)) - done - - [ $retval -eq 0 ] || { - $LOGGER PID file does not exist - exit 1 - } - - mypid=$(cat /var/run/${DAEMON}.pid) - - [ "$mypid" -gt 1 ] 2> /dev/null || { - $LOGGER PID file contains garbage - exit 1 - } - - timeout=$TIMEOUT - kill $mypid 2>/dev/null - pgrep $DAEMON | grep -w $mypid &>/dev/null - retval=$? - - while [ $retval -eq 0 -a $timeout -gt 0 ]; do - sleep 10 - pgrep $DAEMON | grep -w $mypid &>/dev/null - retval=$? - [ $retval -eq 0 ] && kill $mypid 2>/dev/null - timeout=$(($timeout-10)) - done - - [ $retval -ne 1 ] && { - $LOGGER Failed to stop $DAEMON - exit 1 - } -} -- 2.30.2