From 442fc69786e980b3b74c4bcf1a1e7163cc1dbdb1 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 27 Sep 2018 04:46:17 +0200 Subject: [PATCH] tools/frr: remove "watchfrr.started" hack This is no longer neccessary since start-stop-daemon will block until watchfrr's launch parent has exited. Signed-off-by: David Lamparter --- tools/frr.in | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tools/frr.in b/tools/frr.in index dd34b08876..4ff080909d 100755 --- a/tools/frr.in +++ b/tools/frr.in @@ -28,7 +28,6 @@ FRR_VTY_GROUP="@enable_vty_group@" # frrvty DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd" MAX_INSTANCES=5 RELOAD_SCRIPT="$D_PATH/frr-reload.py" -WATCHFRR_STARTED="$V_PATH/watchfrr.started" if [ -e /lib/lsb/init-functions ]; then . /lib/lsb/init-functions @@ -128,23 +127,13 @@ start() echo -n " $1" fi - if [ -e $WATCHFRR_STARTED ] ; then - rm $WATCHFRR_STARTED - fi - ${SSD} \ + ${SSD} \ --start \ --pidfile=`pidfile $1` \ --exec "$D_PATH/$1" \ -- \ "${watchfrr_options[@]}" - for i in `seq 1 10`; - do - if [ -e $WATCHFRR_STARTED ] ; then - break - else - sleep 1 - fi - done + elif [ -n "$2" ]; then echo -n " $1-$2" if ! check_daemon $1 $2 ; then -- 2.39.5