From: David Lamparter <equinox@opensourcerouting.org>
Date: Wed, 2 Aug 2017 18:44:35 +0000 (+0200)
Subject: tools: remove watchfrr -A/-a/-z from init scripts
X-Git-Tag: frr-4.0-dev~435^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=27e295b591bad314abe696f0bac06a83af66577c;p=mirror%2Ffrr.git

tools: remove watchfrr -A/-a/-z from init scripts

These don't exist anymore.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/redhat/daemons b/redhat/daemons
index 94d6c72c30..8d12a1f5b8 100644
--- a/redhat/daemons
+++ b/redhat/daemons
@@ -35,7 +35,7 @@
 # group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
 #
 watchfrr_enable=no
-watchfrr_options=("-Az" "-b_" "-r/etc/init.d/frr_restart_%s" "-s/etc/init.d/frr_start_%s" "-k/etc/init.d/frr_stop_%s")
+watchfrr_options=("-b_" "-r/etc/init.d/frr_restart_%s" "-s/etc/init.d/frr_start_%s" "-k/etc/init.d/frr_stop_%s")
 #
 zebra=no
 bgpd=no
diff --git a/tools/etc/frr/daemons.conf b/tools/etc/frr/daemons.conf
index 3f734eef02..0d92d13671 100644
--- a/tools/etc/frr/daemons.conf
+++ b/tools/etc/frr/daemons.conf
@@ -19,7 +19,7 @@ babeld_options="  --daemon -A 127.0.0.1"
 
 # The list of daemons to watch is automatically generated by the init script.
 watchfrr_enable=yes
-watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30)
+watchfrr_options=(-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30)
 
 # If valgrind_enable is 'yes' the frr daemons will be started via valgrind.
 # The use case for doing so is tracking down memory leaks, etc in frr.