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 94d6c72c300c2ab4cbd6a6167550133edb3389d8..8d12a1f5b8bad88c06a4c40202a8a1d5aa77369c 100644 (file)
--- 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 3f734eef0262fdda6e7931c61251f8272fd2e0ed..0d92d13671ab63a0fa097c9e2527a7c996ed807c 100644 (file)
--- 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.