diff options
| author | Daniil Baturin <daniil@vyos.io> | 2022-08-22 17:51:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 17:51:01 +0100 |
| commit | a63c8d6c4ca796dc9d8a8bc78cc7e80adbb396d0 (patch) | |
| tree | f112c255b33514c409fc315932387ddc1f2fed98 | |
| parent | 2c7fe635994f81a4a8dd9708264b791ebc2a106b (diff) | |
| parent | 33db81f8055fa471d3b0b6cdf78c2a057c11a0fc (diff) | |
| download | vyos-1x-a63c8d6c4ca796dc9d8a8bc78cc7e80adbb396d0.tar.gz vyos-1x-a63c8d6c4ca796dc9d8a8bc78cc7e80adbb396d0.zip | |
Merge pull request #1479 from c-po/macsec-t4538-equuleus
ethernet: T4538: fix wrong systemd unit used for EAPoL (equuleus)
| -rwxr-xr-x | src/conf_mode/interfaces-ethernet.py | 4 | ||||
| -rw-r--r-- | src/etc/systemd/system/wpa_supplicant-wired@.service.d/override.conf | 11 |
2 files changed, 13 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: diff --git a/src/etc/systemd/system/wpa_supplicant-wired@.service.d/override.conf b/src/etc/systemd/system/wpa_supplicant-wired@.service.d/override.conf new file mode 100644 index 000000000..030b89a2b --- /dev/null +++ b/src/etc/systemd/system/wpa_supplicant-wired@.service.d/override.conf @@ -0,0 +1,11 @@ +[Unit] +After= +After=vyos-router.service + +[Service] +WorkingDirectory= +WorkingDirectory=/run/wpa_supplicant +PIDFile=/run/wpa_supplicant/%I.pid +ExecStart= +ExecStart=/sbin/wpa_supplicant -c/run/wpa_supplicant/%I.conf -Dwired -P/run/wpa_supplicant/%I.pid -i%I +ExecReload=/bin/kill -HUP $MAINPID |