From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 28 Mar 2018 18:52:55 +0000 (-0400)
Subject: tools: Cleanup shutdown
X-Git-Tag: frr-5.0-dev~101^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ac654d7b9db6ba5b9ab933be44890e2136318405;p=mirror%2Ffrr.git

tools: Cleanup shutdown

The shutdown code was sometimes taking 1 minute to run because
the ssd program was misbehaving after a make install.

This commit just removes the usage of ssd for shutdown
since we already have a pid file and we know that the
frr script cleans up the pid file as well.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/tools/frr b/tools/frr
index 0f6140d3ec..6de19a4bde 100755
--- a/tools/frr
+++ b/tools/frr
@@ -187,7 +187,7 @@ stop()
     else
         PIDFILE=`pidfile $inst`
         PID=`cat $PIDFILE 2>/dev/null`
-        ${SSD} --stop --quiet --retry=TERM/30/KILL/5 --oknodo --pidfile "$PIDFILE" --exec "$D_PATH/$1"
+        kill -2 $PID 2>/dev/null
         #
         #       Now we have to wait until $DAEMON has _really_ stopped.
         #