From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2BF27139084 for ; Mon, 27 Nov 2017 20:22:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62C92E0ECF; Mon, 27 Nov 2017 20:22:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E8C9E0ECF for ; Mon, 27 Nov 2017 20:22:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB95F33BF05 for ; Mon, 27 Nov 2017 20:22:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B53BA9AD for ; Mon, 27 Nov 2017 20:22:51 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1511814126.986cf37b69299d2aa9d4eb678a2798b0bc021bc0.robbat2@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: net/ X-VCS-Repository: proj/netifrc X-VCS-Files: net/wpa_supplicant.sh X-VCS-Directories: net/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 986cf37b69299d2aa9d4eb678a2798b0bc021bc0 X-VCS-Branch: master Date: Mon, 27 Nov 2017 20:22:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9c2d29a2-961c-4a66-9a05-27d51455b014 X-Archives-Hash: a2d20acebb2205fa0d297d41514e8435 commit: 986cf37b69299d2aa9d4eb678a2798b0bc021bc0 Author: Henning Schild hennsch de> AuthorDate: Fri Nov 24 13:02:58 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Nov 27 20:22:06 2017 +0000 URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=986cf37b net/wpa_supplicant: change how we match wired connections Before that patch you needed to write "-Dwired" in /etc/conf.d/net. Where in fact "-D wired" or even a string with multiple spaces would be ok for wpa_supplicant. Signed-off-by: Henning Schild hennsch.de> Closes: https://github.com/gentoo/netifrc/pull/27 Signed-off-by: Robin H. Johnson gentoo.org> (cherry picked from commit f5b82067ee5ce9badf328c92723e36a86588e74d) net/wpa_supplicant.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh index c487238..5df662a 100644 --- a/net/wpa_supplicant.sh +++ b/net/wpa_supplicant.sh @@ -63,10 +63,11 @@ wpa_supplicant_pre_start() eval opts=\$wpa_supplicant_${IFVAR} eval cliopts=\$wpa_cli_${IFVAR} [ -z "${cliopts}" ] && cliopts=${wpa_cli} - case " ${opts} " in - *" -Dwired "*) wireless=false;; - *) _is_wireless || return 0;; - esac + if echo " $opts " | grep -q " \-D[[:space:]]wired "; then + wireless=false + else + _is_wireless || return 0 + fi # We don't configure wireless if we're being called from # the background unless we're not currently running