summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-08-19 18:55:24 +0200
committerChristian Poessinger <christian@poessinger.com>2022-08-19 20:04:00 +0200
commit33db81f8055fa471d3b0b6cdf78c2a057c11a0fc (patch)
tree42e622e7e575240b50f6f090b07b97f13ce820da /src/conf_mode
parentdc0e468046bef4aef3ee81eec23c3703e0b5da85 (diff)
downloadvyos-1x-33db81f8055fa471d3b0b6cdf78c2a057c11a0fc.tar.gz
vyos-1x-33db81f8055fa471d3b0b6cdf78c2a057c11a0fc.zip
ethernet: T4538: fix wrong systemd unit used for EAPoL
When MACsec was bound to an ethernet interface and the underlaying source-interface got changed (even description only) this terminated the MACsec session running on top of it. The root cause is when EAPoL was implemented in commit d59354e52a8a7f we re-used the same systemd unit which is responsible for MACsec. That indeed lead to the fact that wpa_supplicant was always stopped when anything happened on the underlaying source-interface that was not related to EAPoL. (cherry picked from commit f92a23ef9ab8be59681e5b7ba627e399d89bce53)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-ethernet.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index e8236bf89..75690dd81 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -153,9 +153,9 @@ def apply(ethernet):
else:
e.update(ethernet)
if 'eapol' in ethernet:
- eapol_action='restart'
+ eapol_action='reload-or-restart'
- call(f'systemctl {eapol_action} wpa_supplicant-macsec@{ifname}')
+ call(f'systemctl {eapol_action} wpa_supplicant-wired@{ifname}')
if __name__ == '__main__':
try: