Date: Mon, 26 Jun 2023 12:08:23 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 6a50f0e12d9c - stable/13 - network.subr: adjust regex for wlans_xxxxx rc.conf entries Message-ID: <202306261208.35QC8NuT082835@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6a50f0e12d9c1dce684a4ad93cebdd815636add4 commit 6a50f0e12d9c1dce684a4ad93cebdd815636add4 Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2023-04-18 14:40:13 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306261208.35QC8NuT082835>