diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-08 20:44:25 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-08 20:44:25 +0200 |
| commit | dbb12b8da9761c6fed8f177b5c919622491d6da0 (patch) | |
| tree | ec0c7266bcdbb869d87504b48a6793c94fe1ea29 /tools | |
| parent | doc: Fix spelling mistake. (diff) | |
| parent | Merge pull request #477 from opensourcerouting/gitignore (diff) | |
| download | frr-dbb12b8da9761c6fed8f177b5c919622491d6da0.tar.xz frr-dbb12b8da9761c6fed8f177b5c919622491d6da0.zip | |
Merge remote-tracking branch 'origin/master' into datacenter
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/etc/default/frr | 1 | ||||
| -rw-r--r-- | tools/etc/frr/daemons | 1 | ||||
| -rw-r--r-- | tools/etc/frr/daemons.conf | 6 | ||||
| -rwxr-xr-x | tools/frr | 13 |
4 files changed, 19 insertions, 2 deletions
diff --git a/tools/etc/default/frr b/tools/etc/default/frr index ae960b9e1..693fa6339 100644 --- a/tools/etc/default/frr +++ b/tools/etc/default/frr @@ -7,3 +7,4 @@ OSPF6D_OPTIONS="-A ::1" RIPD_OPTIONS="-A 127.0.0.1" RIPNGD_OPTIONS="-A ::1" ISISD_OPTIONS="-A 127.0.0.1" +EIGRP_OPTIONS="-A 127.0.0.1" diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons index cf58caeb4..eb7a5c9a9 100644 --- a/tools/etc/frr/daemons +++ b/tools/etc/frr/daemons @@ -31,3 +31,4 @@ isisd=no pimd=no ldpd=no nhrpd=no +eigrpd=no diff --git a/tools/etc/frr/daemons.conf b/tools/etc/frr/daemons.conf index eed8379e8..21ae29d4c 100644 --- a/tools/etc/frr/daemons.conf +++ b/tools/etc/frr/daemons.conf @@ -14,7 +14,13 @@ 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 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 @@ -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 @@ -150,12 +150,21 @@ start() return; fi - ${SSD} \ + if [ $valgrind_enable = "yes" ]; then + ${SSD} \ + --start \ + --pidfile=`pidfile $1` \ + --exec $valgrind \ + -- --trace-children=no --leak-check=full --log-file=/var/log/frr/$1-valgrind.log $D_PATH/$1 \ + `eval echo "$""$1""_options"` + else + ${SSD} \ --start \ --pidfile=`pidfile $1` \ --exec "$D_PATH/$1" \ -- \ `eval echo "$""$1""_options"` + fi fi } |