From: David Lamparter <equinox@opensourcerouting.org>
Date: Thu, 27 Sep 2018 02:46:17 +0000 (+0200)
Subject: tools/frr: remove "watchfrr.started" hack
X-Git-Tag: frr-7.1-dev~294^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=442fc69786e980b3b74c4bcf1a1e7163cc1dbdb1;p=mirror%2Ffrr.git

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 <equinox@diac24.net>
---

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