From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 3 Jun 2015 15:20:45 +0000 (-0700)
Subject: Fixup of Code to allow pimd to actually run on startup
X-Git-Tag: frr-2.0-rc1~838
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=11364de5106d05c43bfd6954cb756937054fb317;p=mirror%2Ffrr.git

Fixup of Code to allow pimd to actually run on startup

Fixup of various control files to allow quagga to startup
properly with pimd actually part of the set
---

diff --git a/cumulus/etc/quagga/debian.conf b/cumulus/etc/quagga/debian.conf
index 0b7819e1ed..88df9424e2 100644
--- a/cumulus/etc/quagga/debian.conf
+++ b/cumulus/etc/quagga/debian.conf
@@ -11,6 +11,8 @@ ospf6d_options=" --daemon -A ::1"
 ripd_options="   --daemon -A 127.0.0.1"
 ripngd_options=" --daemon -A ::1"
 isisd_options="  --daemon -A 127.0.0.1"
+pimd_options="  --daemon -A 127.0.0.1"
+
 # The list of daemons to watch is automatically generated by the init script.
 watchquagga_enable=yes
 watchquagga_options=(-adz -r /usr/sbin/servicebBquaggabBrestartbB%s -s /usr/sbin/servicebBquaggabBstartbB%s -k /usr/sbin/servicebBquaggabBstopbB%s -b bB -t 30)
diff --git a/cumulus/etc/quagga/pimd.conf b/cumulus/etc/quagga/pimd.conf
new file mode 100644
index 0000000000..8aa1e7f5f0
--- /dev/null
+++ b/cumulus/etc/quagga/pimd.conf
@@ -0,0 +1,5 @@
+hostname pimd
+password cn321
+enable password cn321
+log timestamp precision 6
+log file /var/log/quagga/pimd.log
diff --git a/debian/tests/daemons b/debian/tests/daemons
index 14279a8df9..52c156a1d6 100644
--- a/debian/tests/daemons
+++ b/debian/tests/daemons
@@ -6,7 +6,7 @@ set -e
 
 # modify config file to enable all daemons and copy config files
 CONFIG_FILE=/etc/quagga/daemons
-DAEMONS=("zebra" "bgpd" "ospfd" "ospf6d" "ripd" "ripngd" "isisd")
+DAEMONS=("zebra" "bgpd" "ospfd" "ospf6d" "ripd" "ripngd" "isisd" "pimd")
 
 for daemon in "${DAEMONS[@]}"
 do
diff --git a/tools/quagga b/tools/quagga
index cf9aa661d9..c6164d5c7e 100755
--- a/tools/quagga
+++ b/tools/quagga
@@ -21,7 +21,7 @@ V_PATH=/var/run/quagga
 # Local Daemon selection may be done by using /etc/quagga/daemons.
 # See /usr/share/doc/quagga/README.Debian.gz for further information.
 # Keep zebra first and do not list watchquagga!
-DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd"
 MAX_INSTANCES=5
 RELOAD_SCRIPT=/usr/lib/quagga/quagga-reload.py