wpa_supplicant: Changed systemd template units
PATCH 1/1 wpa_supplicant: Changed systemd template units
From: Joshua DeWeese <[email protected]>
https://www.freedesktop.org/software/systemd/man/systemd.unit.html#WantedBy=
When building root filesystems with any of the wpa_supplicant systemd template service files enabled (current default is to have them disabled) the systemd-native-fake script would not process the line:
Alias=multi-user.target.wants/wpa_supplicant@%i.service
appropriately due the the use of "%i."
According to the systemd documentation "WantedBy=foo.service in a service bar.service is mostly equivalent to Alias=foo.service.wants/bar.service in the same file." However, this is not really the intended purpose of install Aliases.
All lines of the form:
Alias=multi-user.target.wants/*%i.service
Were replaced with the following lines:
WantedBy=multi-user.target
--- ...place-systemd-install-Alias-with-WantedBy.patch | 52 ++++++++++++++++++++++ .../wpa-supplicant/wpa-supplicant_2.5.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch new file +52 -0
@@ -0,0 +1,52 @@ +From 94c401733a5a3d294cc412671166e6adfb409f53 Mon Sep 17 00:00:00 2001 +From: Joshua DeWeese <[email protected]> +Date: Wed, 30 Jan 2019 16:19:47 -0500 +Subject: [PATCH] replace systemd install Alias with WantedBy + +According to the systemd documentation "WantedBy=foo.service in a +service bar.service is mostly equivalent to +Alias=foo.service.wants/bar.service in the same file." However, +this is not really the intended purpose of install Aliases. + +Upstream-Status: Submitted [[email protected]] + +Signed-off-by: Joshua DeWeese <[email protected]> +--- + wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in | 2 +- + wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in | 2 +- + wpa_supplicant/systemd/wpa_supplicant.service.arg.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in +index 03ac507..da69a87 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-nl80211-%I.conf -Dnl80211 -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant-nl80211@%i.service ++WantedBy=multi-user.target +diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in +index c8a744d..ca3054b 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-wired-%I.conf -Dwired -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant-wired@%i.service ++WantedBy=multi-user.target +diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in +index 7788b38..55d2b9c 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant@%i.service ++WantedBy=multi-user.target +-- +2.7.4 +
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb +1 -0
@@ -29,6 +29,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://0001-Reject-psk-parameter-set-with-invalid-passphrase-cha.patch \ file://0002-Reject-SET_CRED-commands-with-newline-characters-in-.patch \ file://0003-Reject-SET-commands-with-newline-characters-in-the-s.patch \ + file://0001-replace-systemd-install-Alias-with-WantedBy.patch \ " SRC_URI[md5sum] = "96ff75c3a514f1f324560a2376f13110" SRC_URI[sha256sum] = "cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316"
Signature · 1 line
2.7.4
Quoted 23 lines · Joshua DeWeese
From: Joshua DeWeese <[email protected]>
https://www.freedesktop.org/software/systemd/man/systemd.unit.html#WantedBy=
When building root filesystems with any of the
wpa_supplicantsystemd template service files enabled (current default is to have them disabled) the
systemd-native-fake script would not process the line:Alias=multi-user.target.wants/wpa_supplicant@%i.service
appropriately due the the use of "%i."
According to the systemd documentation "WantedBy=foo.service in a service
bar.service is mostly equivalent to Alias=foo.service.wants/bar.service in
the same file." However, this is not really the intended purpose of install
Aliases.All lines of the form:
Quoted 7 lines
Alias=multi-user.target.wants/*%i.service
Were replaced with the following lines:
WantedBy=multi-user.target
Signed-off-by Joshua DeWeese <[email protected]>
This patch doesn't seem to apply against master (which has 2.6, not 2.5)?
Cheers,
Richard
(No subject)
Here it is, updated to work with wpa-supplicant_2.6.bb.
-- >8 --
From 12d39342b00a1ad5536b105e23b9ea732bba5489 Mon Sep 17 00:00:00 2001
From: Joshua DeWeese <[email protected]>
Date: Tue, 5 Feb 2019 10:08:37 -0500
Subject: [PATCH] wpa_supplicant: Changed systemd template units
https://www.freedesktop.org/software/systemd/man/systemd.unit.html#WantedBy=
When building root filesystems with any of the wpa_supplicant systemd template service files enabled (current default is to have them disabled) the systemd-native-fake script would not process the line:
Alias=multi-user.target.wants/wpa_supplicant@%i.service
appropriately due the the use of "%i."
According to the systemd documentation "WantedBy=foo.service in a service bar.service is mostly equivalent to Alias=foo.service.wants/bar.service in the same file." However, this is not really the intended purpose of install Aliases.
All lines of the form:
Alias=multi-user.target.wants/*%i.service
Were replaced with the following lines:
WantedBy=multi-user.target
--- ...place-systemd-install-Alias-with-WantedBy.patch | 52 ++++++++++++++++++++++ .../wpa-supplicant/wpa-supplicant_2.6.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch new file +52 -0
@@ -0,0 +1,52 @@ +From 94c401733a5a3d294cc412671166e6adfb409f53 Mon Sep 17 00:00:00 2001 +From: Joshua DeWeese <[email protected]> +Date: Wed, 30 Jan 2019 16:19:47 -0500 +Subject: [PATCH] replace systemd install Alias with WantedBy + +According to the systemd documentation "WantedBy=foo.service in a +service bar.service is mostly equivalent to +Alias=foo.service.wants/bar.service in the same file." However, +this is not really the intended purpose of install Aliases. + +Upstream-Status: Submitted [[email protected]] + +Signed-off-by: Joshua DeWeese <[email protected]> +--- + wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in | 2 +- + wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in | 2 +- + wpa_supplicant/systemd/wpa_supplicant.service.arg.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in +index 03ac507..da69a87 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-nl80211-%I.conf -Dnl80211 -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant-nl80211@%i.service ++WantedBy=multi-user.target +diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in +index c8a744d..ca3054b 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-wired-%I.conf -Dwired -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant-wired@%i.service ++WantedBy=multi-user.target +diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in +index 7788b38..55d2b9c 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant@%i.service ++WantedBy=multi-user.target +-- +2.7.4 +
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://key-replay-cve-multiple7.patch \ file://key-replay-cve-multiple8.patch \ file://wpa_supplicant-CVE-2018-14526.patch \ + file://0001-replace-systemd-install-Alias-with-WantedBy.patch \ " SRC_URI[md5sum] = "091569eb4440b7d7f2b4276dbfc03c3c" SRC_URI[sha256sum] = "b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450"
Signature · 1 line
2.11.0
PATCH 1/1 wpa_supplicant: Changed systemd template units
In reply to Richard PurdieFrom: Joshua DeWeese <[email protected]>
I goofed up the scissor line on the last attempt. Not sure how much it matters, but here it is correct this time.
Here it is, updated to work with wpa-supplicant_2.6.bb.
-- >8 --
https://www.freedesktop.org/software/systemd/man/systemd.unit.html#WantedBy=
When building root filesystems with any of the wpa_supplicant systemd template service files enabled (current default is to have them disabled) the systemd-native-fake script would not process the line:
Alias=multi-user.target.wants/wpa_supplicant@%i.service
appropriately due the the use of "%i."
According to the systemd documentation "WantedBy=foo.service in a service bar.service is mostly equivalent to Alias=foo.service.wants/bar.service in the same file." However, this is not really the intended purpose of install Aliases.
All lines of the form:
Alias=multi-user.target.wants/*%i.service
Were replaced with the following lines:
WantedBy=multi-user.target
--- ...place-systemd-install-Alias-with-WantedBy.patch | 52 ++++++++++++++++++++++ .../wpa-supplicant/wpa-supplicant_2.6.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch new file +52 -0
@@ -0,0 +1,52 @@ +From 94c401733a5a3d294cc412671166e6adfb409f53 Mon Sep 17 00:00:00 2001 +From: Joshua DeWeese <[email protected]> +Date: Wed, 30 Jan 2019 16:19:47 -0500 +Subject: [PATCH] replace systemd install Alias with WantedBy + +According to the systemd documentation "WantedBy=foo.service in a +service bar.service is mostly equivalent to +Alias=foo.service.wants/bar.service in the same file." However, +this is not really the intended purpose of install Aliases. + +Upstream-Status: Submitted [[email protected]] + +Signed-off-by: Joshua DeWeese <[email protected]> +--- + wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in | 2 +- + wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in | 2 +- + wpa_supplicant/systemd/wpa_supplicant.service.arg.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in +index 03ac507..da69a87 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-nl80211-%I.conf -Dnl80211 -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant-nl80211@%i.service ++WantedBy=multi-user.target +diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in +index c8a744d..ca3054b 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-wired-%I.conf -Dwired -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant-wired@%i.service ++WantedBy=multi-user.target +diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in +index 7788b38..55d2b9c 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in ++++ b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in +@@ -12,4 +12,4 @@ Type=simple + ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I + + [Install] +-Alias=multi-user.target.wants/wpa_supplicant@%i.service ++WantedBy=multi-user.target +-- +2.7.4 +
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://key-replay-cve-multiple7.patch \ file://key-replay-cve-multiple8.patch \ file://wpa_supplicant-CVE-2018-14526.patch \ + file://0001-replace-systemd-install-Alias-with-WantedBy.patch \ " SRC_URI[md5sum] = "091569eb4440b7d7f2b4276dbfc03c3c" SRC_URI[sha256sum] = "b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450"
Signature · 1 line
2.11.0