From c838ce0e03b14d59b845ec809b0526c314322b71 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 7 Mar 2017 10:49:46 -0500 Subject: [PATCH] cumulus, tools: Allow nhrpd to be brought up Signed-off-by: Donald Sharp --- cumulus/etc/frr/daemons | 1 + cumulus/etc/frr/debian.conf | 1 + tools/frr | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cumulus/etc/frr/daemons b/cumulus/etc/frr/daemons index 91e2a0f5b6..17dfc92ec4 100644 --- a/cumulus/etc/frr/daemons +++ b/cumulus/etc/frr/daemons @@ -30,3 +30,4 @@ ripngd=no isisd=no pimd=no ldpd=no +nhrpd=no diff --git a/cumulus/etc/frr/debian.conf b/cumulus/etc/frr/debian.conf index a4945f39ae..eed8379e8c 100644 --- a/cumulus/etc/frr/debian.conf +++ b/cumulus/etc/frr/debian.conf @@ -13,6 +13,7 @@ ripngd_options=" --daemon -A ::1" isisd_options=" --daemon -A 127.0.0.1" pimd_options=" --daemon -A 127.0.0.1" ldpd_options=" --daemon -A 127.0.0.1" +nhrpd_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/frr b/tools/frr index 8524ab4083..80dd9e8747 100755 --- a/tools/frr +++ b/tools/frr @@ -21,7 +21,7 @@ V_PATH=/var/run/frr # 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" +DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd" MAX_INSTANCES=5 RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py -- 2.39.5