diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-05-02 20:35:01 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-05-02 20:35:01 +0200 |
| commit | 0bfde189978dec10de9994837c71bc795743aea7 (patch) | |
| tree | a13f0aff3d3f119738f7d4fec2aca0b99215042d | |
| parent | def34d52f3482f955335cfa98ff01317f83c1cd8 (diff) | |
| download | vyos-1x-0bfde189978dec10de9994837c71bc795743aea7.tar.gz vyos-1x-0bfde189978dec10de9994837c71bc795743aea7.zip | |
Debian: T8147: remove out-of-tree OpenVPN DCO module - incl. in Kernel 6.18
Move from the out-of-tree to an in-tree variant of the OpenVPN DCO module. As
this was not available in the previous used LTS 6.6 Kernel it now is available
while we upgrade to Linux 6.18.
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | smoketest/scripts/system/test_kernel_options.py | 6 | ||||
| -rwxr-xr-x | smoketest/scripts/system/test_module_load.py | 1 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces_openvpn.py | 2 | ||||
| -rw-r--r-- | src/etc/modprobe.d/openvpn.conf | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/debian/control b/debian/control index ba059ae0b..3e2b41ca6 100644 --- a/debian/control +++ b/debian/control @@ -172,7 +172,6 @@ Depends: openvpn-auth-ldap, openvpn-auth-radius, openvpn-otp, - openvpn-dco, libpam-google-authenticator, # End "interfaces openvpn" # For "interfaces wireguard" diff --git a/smoketest/scripts/system/test_kernel_options.py b/smoketest/scripts/system/test_kernel_options.py index 2f3c54c79..d3de78e4c 100755 --- a/smoketest/scripts/system/test_kernel_options.py +++ b/smoketest/scripts/system/test_kernel_options.py @@ -173,6 +173,12 @@ class TestKernelModules(unittest.TestCase): tmp = re.findall(f'{option}=y', self._config_data) self.assertTrue(tmp) + def test_openvpn_dco(self): + options_to_check = ['CONFIG_OVPN'] + for option in options_to_check: + tmp = re.findall(f'{option}=(y|m)', self._config_data) + self.assertTrue(tmp) + def test_arm64(self): # Only required on arm64 platforms if not IS_ARM64: diff --git a/smoketest/scripts/system/test_module_load.py b/smoketest/scripts/system/test_module_load.py index 29fbb407d..5570d74df 100755 --- a/smoketest/scripts/system/test_module_load.py +++ b/smoketest/scripts/system/test_module_load.py @@ -24,7 +24,6 @@ modules = { "qat_c62x", "qat_c62xvf", "qat_d15xx", "qat_d15xxvf", "qat_dh895xcc", "qat_dh895xccvf"], "accel_ppp": ["ipoe", "vlan_mon"], - "openvpn": ["ovpn-dco-v2"] } class TestKernelModules(unittest.TestCase): diff --git a/src/conf_mode/interfaces_openvpn.py b/src/conf_mode/interfaces_openvpn.py index 16a4ed0b5..ab27fe66e 100755 --- a/src/conf_mode/interfaces_openvpn.py +++ b/src/conf_mode/interfaces_openvpn.py @@ -798,7 +798,7 @@ def apply(openvpn): VTunIf(interface).remove() # dynamically load/unload DCO Kernel extension if requested - dco_module = 'ovpn_dco_v2' + dco_module = 'ovpn' if 'module_load_dco' in openvpn: check_kmod(dco_module) else: diff --git a/src/etc/modprobe.d/openvpn.conf b/src/etc/modprobe.d/openvpn.conf index a9259fea2..db965e61a 100644 --- a/src/etc/modprobe.d/openvpn.conf +++ b/src/etc/modprobe.d/openvpn.conf @@ -1 +1 @@ -blacklist ovpn-dco-v2 +blacklist ovpn |