diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/frrender.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/python/vyos/frrender.py b/python/vyos/frrender.py index 1ea49abe4..69bb93a96 100644 --- a/python/vyos/frrender.py +++ b/python/vyos/frrender.py @@ -34,7 +34,6 @@ from vyos.defaults import frr_debug_enable from vyos.utils.dict import dict_search from vyos.utils.dict import dict_set_nested from vyos.utils.file import write_file -from vyos.utils.process import cmdl from vyos.utils.process import rc_cmd from vyos.template import get_dhcp_router from vyos.template import render_to_string @@ -928,5 +927,10 @@ class FRRender: if count >= count_max: raise ConfigError(emsg) - # T3217: Save FRR configuration to /run/frr/config/frr.conf - return cmdl(['/usr/bin/vtysh', '-n', '--writeconfig']) + # frr-reload.py --reload has already saved the configuration to + # /etc/frr/frr.conf (bind-mounted from /run/frr/config/frr.conf): it + # does so whenever it is not run with --daemon. T3217 added a second + # save here when VyOS still reloaded one daemon at a time with + # --daemon. Repeating it asks every daemon for its configuration once + # more, and a bgpd busy with a policy walk then holds the commit until + # the walk ends. |