summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2018-03-28 20:52:55 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2018-03-28 20:52:55 +0200
commitac654d7b9db6ba5b9ab933be44890e2136318405 (patch)
tree943f4f75333a95aecab465753956623821161a99 /tools
parentMerge pull request #1854 from qlyoung/integer-standards-compliance (diff)
downloadfrr-ac654d7b9db6ba5b9ab933be44890e2136318405.tar.xz
frr-ac654d7b9db6ba5b9ab933be44890e2136318405.zip
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>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/frr2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/frr b/tools/frr
index 0f6140d3e..6de19a4bd 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.
#