diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-08-06 11:54:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-06 11:54:05 +0200 |
| commit | 254ea4c805c6c6c404dc767e820c0661fe6524f3 (patch) | |
| tree | dcbf6a9084a234288a034ddb116e1153a7400bab /src/conf_mode/system_ip.py | |
| parent | acd27ebb5f80d7356d727742260d6c01d4ebce7a (diff) | |
| parent | 8500e8658ff10f52739143fd7814cf60c9195f16 (diff) | |
| download | vyos-1x-254ea4c805c6c6c404dc767e820c0661fe6524f3.tar.gz vyos-1x-254ea4c805c6c6c404dc767e820c0661fe6524f3.zip | |
Merge pull request #3945 from c-po/T3204-sysctl
sysctl: T3204: restore sysctl setttings overwritten by tuned
Diffstat (limited to 'src/conf_mode/system_ip.py')
| -rwxr-xr-x | src/conf_mode/system_ip.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/conf_mode/system_ip.py b/src/conf_mode/system_ip.py index 2a0bda91a..c8a91fd2f 100755 --- a/src/conf_mode/system_ip.py +++ b/src/conf_mode/system_ip.py @@ -24,7 +24,8 @@ from vyos.utils.dict import dict_search from vyos.utils.file import write_file from vyos.utils.process import is_systemd_service_active from vyos.utils.system import sysctl_write - +from vyos.configdep import set_dependents +from vyos.configdep import call_dependents from vyos import ConfigError from vyos import frr from vyos import airbag @@ -52,6 +53,11 @@ def get_config(config=None): get_first_key=True)}} # Merge policy dict into "regular" config dict opt = dict_merge(tmp, opt) + + # If IPv4 ARP table size is set here and also manually in sysctl, the more + # fine grained value from sysctl must win + set_dependents('sysctl', conf) + return opt def verify(opt): @@ -127,6 +133,8 @@ def apply(opt): frr_cfg.add_before(frr.default_add_before, opt['frr_zebra_config']) frr_cfg.commit_configuration(zebra_daemon) + call_dependents() + if __name__ == '__main__': try: c = get_config() |