Merge pull request #3502 from donaldsharp/socket_to_me_baby

[mirror_frr.git] / redhat / daemons

diff --git a/redhat/daemons b/redhat/daemons
index 94d6c72c300c2ab4cbd6a6167550133edb3389d8..7f3ff36df9db6620072310ff217ad35d7da9719f 100644 (file)
--- a/redhat/daemons
+++ b/redhat/daemons
@@ -34,8 +34,8 @@
 # When using "vtysh" such a config file is also needed. It should be owned by
 # 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_enable=yes
+watchfrr_options="-r '/usr/lib/frr/frr restart %s' -s '/usr/lib/frr/frr start %s' -k '/usr/lib/frr/frr stop %s'"
 #
 zebra=no
 bgpd=no
@@ -49,6 +49,12 @@ pimd=no
 nhrpd=no
 eigrpd=no
 babeld=no
+sharpd=no
+pbrd=no
+staticd=no
+bfdd=no
+fabricd=no
+
 #
 # Command line options for the daemons
 #
@@ -64,4 +70,17 @@ pimd_options=("-A 127.0.0.1")
 nhrpd_options=("-A 127.0.0.1")
 eigrpd_options=("-A 127.0.0.1")
 babeld_options=("-A 127.0.0.1")
+sharpd_options=("-A 127.0.0.1")
+pbrd_options=("-A 127.0.0.1")
+staticd_options=("-A 127.0.0.1")
+bfdd_options=("-A 127.0.0.1")
+fabricd_options=("-A 127.0.0.1")
+
+#
+# If the vtysh_enable is yes, then the unified config is read
+# and applied if it exists.  If no unified frr.conf exists
+# then the per-daemon <daemon>.conf files are used)
+# If vtysh_enable is no or non-existant, the frr.conf is ignored.
+# it is highly suggested to have this set to yes
+vtysh_enable=yes