From nobody Thu Apr 20 14:31:01 2023 X-Original-To: dev-commits-src-all@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 4Q2KpF6gMSz468By; Thu, 20 Apr 2023 14:31:01 +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 4Q2KpF5RtNz4KNk; Thu, 20 Apr 2023 14:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682001061; 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=EvApKkjqXVZZ4+8DdKzCj/lwRj3bWJjw20/0t+sSJ1Y=; b=RvARH1CwESGP9qFfy8Qsu+KbtHMenvXH1nQni8ee2EJPGWRTe5SWXUZShdCrs+1vbXwJY9 0QzbiqIS3rO/v2YwFdM277vnqA+0cXfSMNA4SHArNgubZNsNDPQHk+/h109xrpTi5n68aD JCvyR9FpA/E3o9tf98EkkUp4YonstMW26oZ+CbyaPMJ9BTpVVAdh2nuA0Bfki2Nf+9aolu 0VslDx0SszLyR9A2Fgthe6M5Fe91ewGaMIUSZHX8+4uoBTuONr88P7NROpZaBPWYDwn6SA 2x6gBq6CsZ5uTeFT5W+UrFWus0PfIK3mHpana+o7BwYr65bO5V2HL/xf/BZhtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682001061; 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=EvApKkjqXVZZ4+8DdKzCj/lwRj3bWJjw20/0t+sSJ1Y=; b=X7rVynEESE2bEy+G0XdZE4kaIg3Dt8GetlSk5CNN9077UXG85yWPq8zMKuN30QxrPnWkbA Izi3IAx7/qwf1RmCdiPMb1A9BAIR5t7Un295MbJlSxomDHceCfaBJVW+ESLWnwhWcNqHAx 3OGaO7j0NqYdqCifyrIyWVloMCq2VkYfmdiI7B2wYvoPbIotvOvhVERrIuwuNG0Q112qx4 JqpHZ1zdoafzAeRTc7fjE69DHOqK7OGSNVzGO3GGlHUXsI1fS99OwbRXTjRYByr4vfVXbW 2uc4vgHDynbCkClHoasl74G5vHNvad7LzoQqHMkVi7nSZlSk9rra8CPVir86VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682001061; a=rsa-sha256; cv=none; b=AYJH1rf9pidB16PzqEFa8l5FeNPAezIjeZ8ljkI0Qop4TmE9/hshjBPqFQlb3he6dd3b5y prTn71D6HfUlSJ1/0ONKBxgfFOlQq9Xob2YAV0mU9LISI8C1EJF/qAuPhwEvcAWu2UvX6R 2ORFJb2/VRsVpIbYaEs8zt9LHTW6iTf1CUhWW/vVejonljZ4S7SqFXhBuIL9XsLybIFHbn 9dKWhaCO+gStXSZUrrzltd1jGYRPJhXTIZgsV6NXeyyC/SSwUfZfm8K6LVCWP6sL7v9c4Q rshAL5C/pZ4hQglz8GFYIbrcxQGu6Pxo2MSHMH9lQ9QosaBBxqRcTsH9bcJIVw== 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 4Q2KpF4YtVzhJR; Thu, 20 Apr 2023 14:31:01 +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 33KEV1ka074225; Thu, 20 Apr 2023 14:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KEV1tk074224; Thu, 20 Apr 2023 14:31:01 GMT (envelope-from git) Date: Thu, 20 Apr 2023 14:31:01 GMT Message-Id: <202304201431.33KEV1tk074224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: de1dde5dfea4 - main - network.subr: adjust regex for wlans_xxxxx rc.conf entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: de1dde5dfea4407119955a6f94528396b258db3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=de1dde5dfea4407119955a6f94528396b258db3f commit de1dde5dfea4407119955a6f94528396b258db3f Author: Bjoern A. Zeeb AuthorDate: 2023-04-18 14:40:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-04-20 14:30:42 +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="..." MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39674 --- 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