diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-02-08 16:14:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 16:14:28 +0000 |
| commit | ec60a936645a22050db1550de12ca1fbb63abfbe (patch) | |
| tree | a38bd396210e621a8eac110151936c9f4f5f3f68 /src | |
| parent | 5f66a2d1422badaac89028d97aa12165a99fbb8a (diff) | |
| parent | 4e4c645b47e81ec54c8b02d2f4377664e5689a86 (diff) | |
| download | vyos-1x-ec60a936645a22050db1550de12ca1fbb63abfbe.tar.gz vyos-1x-ec60a936645a22050db1550de12ca1fbb63abfbe.zip | |
Merge pull request #2964 from vyos/mergify/bp/sagitta/pr-2952
vrf: T5973: module is now statically compiled into the kernel (backport #2952)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/vrf.py | 14 | ||||
| -rw-r--r-- | src/etc/sysctl.d/30-vyos-router.conf | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py index f2c544aa6..a2f4956be 100755 --- a/src/conf_mode/vrf.py +++ b/src/conf_mode/vrf.py @@ -27,7 +27,6 @@ from vyos.ifconfig import Interface from vyos.template import render from vyos.template import render_to_string from vyos.utils.dict import dict_search -from vyos.utils.kernel import check_kmod from vyos.utils.network import get_interface_config from vyos.utils.network import get_vrf_members from vyos.utils.network import interface_exists @@ -223,18 +222,6 @@ def apply(vrf): # Delete the VRF Kernel interface call(f'ip link delete dev {tmp}') - # Enable/Disable VRF strict mode - # When net.vrf.strict_mode=0 (default) it is possible to associate multiple - # VRF devices to the same table. Conversely, when net.vrf.strict_mode=1 a - # table can be associated to a single VRF device. - # - # A VRF table can be used by the VyOS CLI only once (ensured by verify()), - # this simply adds an additional Kernel safety net - strict_mode = '0' - # Set to 1 if any VRF is defined - if 'name' in vrf: strict_mode = '1' - sysctl_write('net.vrf.strict_mode', strict_mode) - if 'name' in vrf: # Linux routing uses rules to find tables - routing targets are then # looked up in those tables. If the lookup got a matching route, the @@ -323,7 +310,6 @@ def apply(vrf): if __name__ == '__main__': try: - check_kmod(k_mod) c = get_config() verify(c) generate(c) diff --git a/src/etc/sysctl.d/30-vyos-router.conf b/src/etc/sysctl.d/30-vyos-router.conf index 6291be5f0..c9b8ef8fe 100644 --- a/src/etc/sysctl.d/30-vyos-router.conf +++ b/src/etc/sysctl.d/30-vyos-router.conf @@ -108,3 +108,5 @@ net.ipv4.tcp_congestion_control=bbr # Disable IPv6 Segment Routing packets by default net.ipv6.conf.all.seg6_enabled = 0 net.ipv6.conf.default.seg6_enabled = 0 + +net.vrf.strict_mode = 1 |