diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-10-05 18:28:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-05 18:28:00 +0200 |
| commit | b4e84851424c97317bc761e3b991e16c68839aa8 (patch) | |
| tree | 8e2c9496c2a8cdf2ac97faacb2ff9812d6019ac8 /python | |
| parent | 4fefde0b185b419555c7691909be2a0c05862c0a (diff) | |
| parent | d16a88c2717e87f9184587281547e45506df4215 (diff) | |
| download | vyos-1x-b4e84851424c97317bc761e3b991e16c68839aa8.tar.gz vyos-1x-b4e84851424c97317bc761e3b991e16c68839aa8.zip | |
Merge pull request #5524 from alexk37/frrender-no-second-save
frrender: T9377: do not save the FRR configuration a second time
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. |