Added config option for valgrind executable

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

diff --git a/cumulus/etc/frr/debian.conf b/cumulus/etc/frr/debian.conf
index 7b9b20bd5bed509d2bd5a43b11c359e178b0d4c8..5ac61d4d5cb4d31303eeffb14001a38772ecc86e 100644 (file)
--- a/cumulus/etc/frr/debian.conf
+++ b/cumulus/etc/frr/debian.conf
@@ -4,7 +4,6 @@
 # Check /etc/pam.d/frr if you intend to use "vtysh"!
 #
 vtysh_enable=yes
-valgrind_enable=no
 zebra_options="  -s 90000000 --daemon -A 127.0.0.1"
 bgpd_options="   --daemon -A 127.0.0.1"
 ospfd_options="  --daemon -A 127.0.0.1"
@@ -19,3 +18,8 @@ nhrpd_options="  --daemon -A 127.0.0.1"
 # The list of daemons to watch is automatically generated by the init script.
 watchfrr_enable=yes
 watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30)
+
+# If valgrind_enable is 'yes' the frr daemons will be started via valgrind.
+# The use case for doing so is tracking down memory leaks, etc in frr.
+valgrind_enable=no
+valgrind=/usr/bin/valgrind

diff --git a/tools/frr b/tools/frr
index 4902b8c9a90871cd74690799c18b27acace5ff74..6b5600b16c82a68153440640010c10ff73950edd 100755 (executable)
--- a/tools/frr
+++ b/tools/frr
@@ -154,7 +154,7 @@ start()
               ${SSD} \
                --start \
                --pidfile=`pidfile $1` \
-               --exec "/usr/bin/valgrind" \
+               --exec $valgrind \
                -- --trace-children=no --leak-check=full --log-file=/var/log/frr/$1-valgrind.log $D_PATH/$1 \
                `eval echo "$""$1""_options"`
            else