| 1 |
commit: 986cf37b69299d2aa9d4eb678a2798b0bc021bc0 |
| 2 |
Author: Henning Schild <henning <AT> hennsch <DOT> de> |
| 3 |
AuthorDate: Fri Nov 24 13:02:58 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 27 20:22:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=986cf37b |
| 7 |
|
| 8 |
net/wpa_supplicant: change how we match wired connections |
| 9 |
|
| 10 |
Before that patch you needed to write "-Dwired" in /etc/conf.d/net. |
| 11 |
Where in fact "-D wired" or even a string with multiple spaces would be |
| 12 |
ok for wpa_supplicant. |
| 13 |
|
| 14 |
Signed-off-by: Henning Schild <henning <AT> hennsch.de> |
| 15 |
Closes: https://github.com/gentoo/netifrc/pull/27 |
| 16 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 17 |
(cherry picked from commit f5b82067ee5ce9badf328c92723e36a86588e74d) |
| 18 |
|
| 19 |
net/wpa_supplicant.sh | 9 +++++---- |
| 20 |
1 file changed, 5 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh |
| 23 |
index c487238..5df662a 100644 |
| 24 |
--- a/net/wpa_supplicant.sh |
| 25 |
+++ b/net/wpa_supplicant.sh |
| 26 |
@@ -63,10 +63,11 @@ wpa_supplicant_pre_start() |
| 27 |
eval opts=\$wpa_supplicant_${IFVAR} |
| 28 |
eval cliopts=\$wpa_cli_${IFVAR} |
| 29 |
[ -z "${cliopts}" ] && cliopts=${wpa_cli} |
| 30 |
- case " ${opts} " in |
| 31 |
- *" -Dwired "*) wireless=false;; |
| 32 |
- *) _is_wireless || return 0;; |
| 33 |
- esac |
| 34 |
+ if echo " $opts " | grep -q " \-D[[:space:]]wired "; then |
| 35 |
+ wireless=false |
| 36 |
+ else |
| 37 |
+ _is_wireless || return 0 |
| 38 |
+ fi |
| 39 |
|
| 40 |
# We don't configure wireless if we're being called from |
| 41 |
# the background unless we're not currently running |
Archives