cumulus, tools: Fix up startup

Allow EIGRP to work within the startup scripts

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/cumulus/etc/frr/daemons b/cumulus/etc/frr/daemons
index 17dfc92ec4ac6f58cec607ef3a101c035e15e0dd..ccc4b2a09ee55580882fcf6d4dc443a2c3ed667e 100644 (file)
--- a/cumulus/etc/frr/daemons
+++ b/cumulus/etc/frr/daemons
@@ -31,3 +31,4 @@ isisd=no
 pimd=no
 ldpd=no
 nhrpd=no
+eigrpd=no

diff --git a/cumulus/etc/frr/debian.conf b/cumulus/etc/frr/debian.conf
index eed8379e8c2c7f52ab29746ab507ddb403c69617..31340537cc3d625eecb3aa97055fae5e9b1caf70 100644 (file)
--- a/cumulus/etc/frr/debian.conf
+++ b/cumulus/etc/frr/debian.conf
@@ -14,6 +14,7 @@ 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"
+eigrpd_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 80dd9e8747fbb32a4a12663c36a54776d855b85b..8ae0b0a6e8bc04695292d1a81c060c5c07ecf67b 100755 (executable)
--- 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 nhrpd"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd"
 MAX_INSTANCES=5
 RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py