From nobody Mon Jun 26 12:08:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QqRSl3T5qz4k6fc; Mon, 26 Jun 2023 12:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QqRSl1mByz3hQm; Mon, 26 Jun 2023 12:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/AZjE6nlqPM2HDk99FBjZlR7kyk+oqpuqdEZI5JUcg=; b=lD2V12jRBh4rKm9zreD1BPbOBIc2B4zmcLh3MNkk9luW5CFsbIiBNSUc2y8q5qfS0hzW8d OLGCKYPchPIm78TKC1UiJahRWvfJUqwqTB9I3ahdnULggiiEAtQlRKmnpb/gTebIiTngIV tw8HdrlEw11HBtuVxz/LjTHckT+bzr14Bhp8a5roLmf/GKLU9zowP+oQBRH5eziAQkw6qZ YEBrSqnhAhoKblbzOiXQamzdjamWWRw3KzJ6IDQLYNKyfTOTV/O7r08LlnL8ZqOvtbv0tF 6PiPomvhwAHLKbxIytUKsaMQ7R88K4wgdQPGfa1DvkcUemDHVPt+RMu9QL822w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/AZjE6nlqPM2HDk99FBjZlR7kyk+oqpuqdEZI5JUcg=; b=GeDLTtc7h0wTansDiJmi+wtLYVoQJEjDlA64I/j6189aFC2or/Fg1SpToe1Vjq7fFR2daT 7PUneI+zkmQ9BDa/BHZ+QuoncWH+hC3LUXhbZ//Ov1H5I4MZ/ztWheeoDGBUGS6Mev16bD KM5EaboY07uNobe3qmRunPkg/S6vTbAgJyOZYiQx3NP1mKhye6NrH65CUe8w+0XNalj+Wy qGe7lsNOPio6roUEQ/Y7smCK2lMX0AB9uAu6rJM7/o8/KZXXdx1+0NUeJNLxkl+LLkZM5C HA9YApKnfufbRs0/v0/TrRrdLOqc1LRUfQCPYG/tXQRU0weNffjgTQaAXNbXCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687781303; a=rsa-sha256; cv=none; b=u7+qLDnf3ocMupFctU5BQI0l8zJ8NKp+MCV52v18KmpqScp7BdQhjyQIs4vEP2voysKHOW +E8kK6mFqf+7VkXrBJZrHb0MuSw4DlvKpjOsk3ZCEJs0aYkjBC3fd0EzVdaQ5QzFHUvoDz ijGik1PgnJLXJ1tjpOmhdA6bMW3SLp/zAg9ezBH5t2dx4wP5ienqcUrQRDHf9hR26Zx8Xj /gin2MnHuAG6c1eqXiUgQ8IvAyZjh9jdw6yCuSuqzueiLWOiCsX1WuU1l9KVxw7D/xnRNc M7fwM68grQef/MV1gjF5gjurtToM1CWhUS3YqlJVzI+KsrPRBJvJkSeKZSd8DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QqRSl0rtTz18Ns; Mon, 26 Jun 2023 12:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35QC8N15082836; Mon, 26 Jun 2023 12:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QC8NuT082835; Mon, 26 Jun 2023 12:08:23 GMT (envelope-from git) Date: Mon, 26 Jun 2023 12:08:23 GMT Message-Id: <202306261208.35QC8NuT082835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6a50f0e12d9c - stable/13 - network.subr: adjust regex for wlans_xxxxx rc.conf entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a50f0e12d9c1dce684a4ad93cebdd815636add4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6a50f0e12d9c1dce684a4ad93cebdd815636add4 commit 6a50f0e12d9c1dce684a4ad93cebdd815636add4 Author: Bjoern A. Zeeb AuthorDate: 2023-04-18 14:40:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-26 09:04:12 +0000 network.subr: adjust regex for wlans_xxxxx rc.conf entries Drivers like ath1[012]k will not match the current wlans_*-regex as they have digits followed by letters. Adjust the regex to allow this combination in order to be able to configure interfaces with names like wlans_ath11k0="..." Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39674 (cherry picked from commit de1dde5dfea4407119955a6f94528396b258db3f) --- libexec/rc/network.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr index 29ac06daefb2..852a548b7afc 100644 --- a/libexec/rc/network.subr +++ b/libexec/rc/network.subr @@ -1259,7 +1259,7 @@ wlan_up() _iflist=$* # Parse wlans_$parent="$child ..." - for parent in `set | sed -nE 's/wlans_([a-z]+[0-9]+)=.*/\1/p'`; do + for parent in `set | sed -nE 's/wlans_([a-z]+[a-z0-9]+[0-9]+)=.*/\1/p'`; do child_wlans=`get_if_var $parent wlans_IF` for child in ${child_wlans}; do create_args="wlandev $parent `get_if_var $child create_args_IF`" @@ -1301,7 +1301,7 @@ wlan_down() _iflist=$* # Parse wlans_$parent="$child ..." - for parent in `set | sed -nE 's/wlans_([a-z]+[0-9]+)=.*/\1/p'`; do + for parent in `set | sed -nE 's/wlans_([a-z]+[a-z0-9]+[0-9]+)=.*/\1/p'`; do child_wlans=`get_if_var $parent wlans_IF` for child in ${child_wlans}; do case $_iflist in