pim6d, tools: install pim6d

... and add it to the daemon lists in the various tools.

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

diff --git a/pimd/subdir.am b/pimd/subdir.am
index 342b93e21f6a1566e5d4042f34d173809a07253d..2ce0a3bb1a5bf99a3353c8d05839704a9de5cb0c 100644 (file)
--- a/pimd/subdir.am
+++ b/pimd/subdir.am
@@ -175,11 +175,7 @@ pimd_pimd_LDADD = lib/libfrr.la $(LIBCAP)
 
 if PIMD
 if DEV_BUILD
-#
-# pim6d is only enabled for --enable-dev-build, and NOT installed currently
-# (change noinst_ to sbin_ below to install it.)
-#
-noinst_PROGRAMS += pimd/pim6d
+sbin_PROGRAMS += pimd/pim6d
 pimd_pim6d_CFLAGS = $(AM_CFLAGS) -DPIM_IPV=6
 pimd_pim6d_LDADD = lib/libfrr.la $(LIBCAP)
 endif

diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
index b1526888ed813f2cac0e354e24df507edd1ac266..7f8e1e29fcfd5ba1239d43f38e30841d032eaa14 100644 (file)
--- a/tools/etc/frr/daemons
+++ b/tools/etc/frr/daemons
@@ -21,6 +21,7 @@ ripd=no
 ripngd=no
 isisd=no
 pimd=no
+pim6d=no
 ldpd=no
 nhrpd=no
 eigrpd=no
@@ -46,6 +47,7 @@ ripd_options="   -A 127.0.0.1"
 ripngd_options=" -A ::1"
 isisd_options="  -A 127.0.0.1"
 pimd_options="   -A 127.0.0.1"
+pim6d_options="" # no telnet port by default
 ldpd_options="   -A 127.0.0.1"
 nhrpd_options="  -A 127.0.0.1"
 eigrpd_options=" -A 127.0.0.1"

diff --git a/tools/etc/rsyslog.d/45-frr.conf b/tools/etc/rsyslog.d/45-frr.conf
index 469e95ed7398339a83af26cf7df545b91972df05..2a1992eabf069481b655b51bb957ee3cfe8cc740 100644 (file)
--- a/tools/etc/rsyslog.d/45-frr.conf
+++ b/tools/etc/rsyslog.d/45-frr.conf
@@ -14,6 +14,7 @@ if  $programname == 'babeld' or
     $programname == 'ospf6d' or
     $programname == 'ospfd' or
     $programname == 'pimd' or
+    $programname == 'pim6d' or
     $programname == 'pathd' or
     $programname == 'ripd' or
     $programname == 'ripngd' or
@@ -33,6 +34,7 @@ if  $programname == 'babeld' or
     $programname == 'ospf6d' or
     $programname == 'ospfd' or
     $programname == 'pimd' or
+    $programname == 'pim6d' or
     $programname == 'pathd' or
     $programname == 'ripd' or
     $programname == 'ripngd' or

diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index f47f9a7eb0267e91af4859a85b809f4b8b8a0af8..8a2b689ac0caeb6e2fc784fdd02ce9fb81cf2573 100755 (executable)
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -1886,6 +1886,7 @@ if __name__ == "__main__":
         "ospfd",
         "pbrd",
         "pimd",
+        "pim6d",
         "ripd",
         "ripngd",
         "sharpd",

diff --git a/tools/frr.in b/tools/frr.in
index 889c075f81d4ec0944cfee02beeda1a13dc46703..27b2c0ab84d8a83b47fe97969ec17226024ba802 100755 (executable)
--- a/tools/frr.in
+++ b/tools/frr.in
@@ -27,7 +27,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter
 # 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 fabricd vrrpd pathd"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
 MAX_INSTANCES=5
 RELOAD_SCRIPT="$D_PATH/frr-reload.py"
 

diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
index 4683ceef14ef3b565054f9272304b245987d8496..14b397555b453fb67af8c3e917cd4f3859f55faa 100644 (file)
--- a/tools/frrcommon.sh.in
+++ b/tools/frrcommon.sh.in
@@ -35,7 +35,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter
 # - keep zebra first
 # - watchfrr does NOT belong in this list
 
-DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
 RELOAD_SCRIPT="$D_PATH/frr-reload.py"
 
 #