Merge pull request #3229 from opensourcerouting/bugfix/fabricd-distribution

Add fabricd to distribution scripts

7 files changed, 8 insertions, 3 deletions

diff --git a/debianpkg/frr.logrotate b/debianpkg/frr.logrotate
index 750b9aef13..1dc9122ac4 100644
--- a/debianpkg/frr.logrotate
+++ b/debianpkg/frr.logrotate
@@ -17,7 +17,7 @@
             # open, as well as the daemons, so always signal the daemons.
             # It's safe, a NOP if (only) syslog is being used.
             for i in babeld bgpd eigrpd isisd ldpd nhrpd ospf6d ospfd \
-                pimd ripd ripngd zebra staticd ; do
+                pimd ripd ripngd zebra staticd fabricd; do
                 if [ -e /var/run/frr/$i.pid ] ; then
                     pids="$pids $(cat /var/run/frr/$i.pid)"
                 fi
diff --git a/debianpkg/frr.manpages b/debianpkg/frr.manpages
index d4bb920b46..f5aa972304 100644
--- a/debianpkg/frr.manpages
+++ b/debianpkg/frr.manpages
@@ -13,3 +13,4 @@ doc/manpages/_build/man/zebra.8
 doc/manpages/_build/man/isisd.8
 doc/manpages/_build/man/watchfrr.8
 doc/manpages/_build/man/mtracebis.8
+doc/manpages/_build/man/fabricd.8
diff --git a/debianpkg/tests/daemons b/debianpkg/tests/daemons
index ac35ecd950..43966c8347 100644
--- a/debianpkg/tests/daemons
+++ b/debianpkg/tests/daemons
@@ -6,7 +6,7 @@ set -e
 
 # modify config file to enable all daemons and copy config files
 CONFIG_FILE=/etc/frr/daemons
-DAEMONS=("zebra" "bgpd" "ospfd" "ospf6d" "ripd" "ripngd" "isisd" "pimd")
+DAEMONS=("zebra" "bgpd" "ospfd" "ospf6d" "ripd" "ripngd" "isisd" "pimd" "fabricd")
 
 for daemon in "${DAEMONS[@]}"
 do
diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
index 474b299d90..1514082e90 100644
--- a/tools/etc/frr/daemons
+++ b/tools/etc/frr/daemons
@@ -36,3 +36,4 @@ babeld=no
 sharpd=no
 pbrd=no
 bfdd=no
+fabricd=no
diff --git a/tools/etc/frr/daemons.conf b/tools/etc/frr/daemons.conf
index 640437f441..bd0e370d1e 100644
--- a/tools/etc/frr/daemons.conf
+++ b/tools/etc/frr/daemons.conf
@@ -20,6 +20,7 @@ sharpd_options="  --daemon -A 127.0.0.1"
 pbrd_options="  --daemon -A 127.0.0.1"
 staticd_options="  --daemon -A 127.0.0.1"
 bfdd_options="  --daemon -A 127.0.0.1"
+fabricd_options="  --daemon -A 127.0.0.1"
 
 # The list of daemons to watch is automatically generated by the init script.
 watchfrr_enable=yes
diff --git a/tools/etc/rsyslog.d/45-frr.conf b/tools/etc/rsyslog.d/45-frr.conf
index ff7cd48318..4612e8beaf 100644
--- a/tools/etc/rsyslog.d/45-frr.conf
+++ b/tools/etc/rsyslog.d/45-frr.conf
@@ -8,6 +8,7 @@ if  $programname == 'babeld' or
     $programname == 'eigrpd' or
     $programname == 'frr' or
     $programname == 'isisd' or
+    $programname == 'fabricd' or
     $programname == 'ldpd' or
     $programname == 'nhrpd' or
     $programname == 'ospf6d' or
@@ -24,6 +25,7 @@ if  $programname == 'babeld' or
     $programname == 'eigrpd' or
     $programname == 'frr' or
     $programname == 'isisd' or
+    $programname == 'fabricd' or
     $programname == 'ldpd' or
     $programname == 'nhrpd' or
     $programname == 'ospf6d' or
diff --git a/tools/frr.in b/tools/frr.in
index c57ef6baf9..ee8dc883dc 100755
--- a/tools/frr.in
+++ b/tools/frr.in
@@ -25,7 +25,7 @@ FRR_VTY_GROUP="@enable_vty_group@" # frrvty
 # Local Daemon selection may be done by using /etc/frr/daemons.
 # See /usr/share/doc/frr/README.Debian.gz for further information.
 # Keep zebra first and do not list watchfrr!
-DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd"
 MAX_INSTANCES=5
 RELOAD_SCRIPT="$D_PATH/frr-reload.py"