From 66c1fbe7665fab4a51cbf1d626925d27e339f118 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 22 Jul 2022 23:17:42 +0200 Subject: macsec: T2023: fixup systemd unit description (cherry picked from commit bc70c1f502bc587627b1bd15f6803c6c09d20a66) --- src/systemd/wpa_supplicant-macsec@.service | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/systemd') diff --git a/src/systemd/wpa_supplicant-macsec@.service b/src/systemd/wpa_supplicant-macsec@.service index 7e0bee8e1..93bebd9d9 100644 --- a/src/systemd/wpa_supplicant-macsec@.service +++ b/src/systemd/wpa_supplicant-macsec@.service @@ -1,12 +1,10 @@ [Unit] -Description=WPA supplicant daemon (macsec-specific version) +Description=WPA supplicant daemon (MACsec-specific version) Requires=sys-subsystem-net-devices-%i.device ConditionPathExists=/run/wpa_supplicant/%I.conf After=vyos-router.service RequiresMountsFor=/run -# NetworkManager users will probably want the dbus version instead. - [Service] Type=simple WorkingDirectory=/run/wpa_supplicant -- cgit v1.2.3 From fdc7814f12bc0bd1a6442284a5dbac8adeb57f54 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 1 Aug 2022 19:46:17 +0200 Subject: macsec: T4537: restart wpa_supplicant on error (cherry picked from commit b2ff1407330e383a9fff688376377efc534bcfbc) --- src/systemd/wpa_supplicant-macsec@.service | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/systemd') diff --git a/src/systemd/wpa_supplicant-macsec@.service b/src/systemd/wpa_supplicant-macsec@.service index 93bebd9d9..39d0bf00b 100644 --- a/src/systemd/wpa_supplicant-macsec@.service +++ b/src/systemd/wpa_supplicant-macsec@.service @@ -9,7 +9,9 @@ RequiresMountsFor=/run Type=simple WorkingDirectory=/run/wpa_supplicant PIDFile=/run/wpa_supplicant/%I.pid -ExecStart=/sbin/wpa_supplicant -c/run/wpa_supplicant/%I.conf -Dmacsec_linux -i%I +ExecStart=/sbin/wpa_supplicant -d -c/run/wpa_supplicant/%I.conf -Dmacsec_linux -i%I +Restart=always +RestartSec=2 [Install] WantedBy=multi-user.target -- cgit v1.2.3 From 52b4b47f9e2484af7d493b72ebf0999c0047bf7b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 1 Aug 2022 20:53:47 +0200 Subject: macsec: T4537: supply PID path via systemd service file to daemon (cherry picked from commit 5e919d3f91bccaf64878a94756c21766896db132) --- src/systemd/wpa_supplicant-macsec@.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/systemd') diff --git a/src/systemd/wpa_supplicant-macsec@.service b/src/systemd/wpa_supplicant-macsec@.service index 39d0bf00b..703009ad5 100644 --- a/src/systemd/wpa_supplicant-macsec@.service +++ b/src/systemd/wpa_supplicant-macsec@.service @@ -9,7 +9,7 @@ RequiresMountsFor=/run Type=simple WorkingDirectory=/run/wpa_supplicant PIDFile=/run/wpa_supplicant/%I.pid -ExecStart=/sbin/wpa_supplicant -d -c/run/wpa_supplicant/%I.conf -Dmacsec_linux -i%I +ExecStart=/sbin/wpa_supplicant -d -c/run/wpa_supplicant/%I.conf -Dmacsec_linux -P/run/wpa_supplicant/%I.pid -i%I Restart=always RestartSec=2 -- cgit v1.2.3 From dc41d55eba5e47a105d295e27fd30a0e6d62c711 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 1 Aug 2022 21:10:19 +0200 Subject: macsec: T4537: remove debug falg "-d" from systemd service file (cherry picked from commit fa25d349aebc86e43957f37db765787fb7e431db) --- src/systemd/wpa_supplicant-macsec@.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/systemd') diff --git a/src/systemd/wpa_supplicant-macsec@.service b/src/systemd/wpa_supplicant-macsec@.service index 703009ad5..d5739583e 100644 --- a/src/systemd/wpa_supplicant-macsec@.service +++ b/src/systemd/wpa_supplicant-macsec@.service @@ -9,7 +9,7 @@ RequiresMountsFor=/run Type=simple WorkingDirectory=/run/wpa_supplicant PIDFile=/run/wpa_supplicant/%I.pid -ExecStart=/sbin/wpa_supplicant -d -c/run/wpa_supplicant/%I.conf -Dmacsec_linux -P/run/wpa_supplicant/%I.pid -i%I +ExecStart=/sbin/wpa_supplicant -c/run/wpa_supplicant/%I.conf -Dmacsec_linux -P/run/wpa_supplicant/%I.pid -i%I Restart=always RestartSec=2 -- cgit v1.2.3