proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 04:47:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #245 from donaldsharp/ldpd_load

Browse Source 
Ldpd load
This commit is contained in:
Renato Westphal 2017-03-03 13:25:17 -03:00 committed by GitHub
commit bc6cec21c4
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cumulus/etc/frr/daemons
View File

@ -28,4 +28,5 @@ ospf6d=no
ripd=no ripd=no
ripngd=no ripngd=no
isisd=no isisd=no
pimd=no
ldpd=no

1
cumulus/etc/frr/debian.conf
View File

@ -12,6 +12,7 @@ ripd_options=" --daemon -A 127.0.0.1"
ripngd_options=" --daemon -A ::1" ripngd_options=" --daemon -A ::1"
isisd_options=" --daemon -A 127.0.0.1" isisd_options=" --daemon -A 127.0.0.1"
pimd_options=" --daemon -A 127.0.0.1" pimd_options=" --daemon -A 127.0.0.1"
ldpd_options=" --daemon -A 127.0.0.1"
# The list of daemons to watch is automatically generated by the init script. # The list of daemons to watch is automatically generated by the init script.
watchfrr_enable=yes watchfrr_enable=yes

3
lib/command.c
View File

@ -1629,7 +1629,8 @@ DEFUN (show_commandtree,
show_commandtree_cmd, show_commandtree_cmd,
"show commandtree [permutations]", "show commandtree [permutations]",
SHOW_STR SHOW_STR
"Show command tree\n") "Show command tree\n"
"Permutations that we are interested in\n")
{ {
return cmd_list_cmds (vty, argc == 3); return cmd_list_cmds (vty, argc == 3);
} }

2
tools/frr
View File

@ -21,7 +21,7 @@ V_PATH=/var/run/frr
# Local Daemon selection may be done by using /etc/frr/daemons. # Local Daemon selection may be done by using /etc/frr/daemons.
# See /usr/share/doc/frr/README.Debian.gz for further information. # See /usr/share/doc/frr/README.Debian.gz for further information.
# Keep zebra first and do not list watchfrr! # Keep zebra first and do not list watchfrr!
DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd" DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd"
MAX_INSTANCES=5 MAX_INSTANCES=5
RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py