Date: Tue, 21 Jul 2026 15:48:05 +0000 From: Siva Mahadevan <siva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 5aa70e0478a4 - stable/15 - bsdinstall/netconfig: use a better heuristic for wlan dev desc Message-ID: <6a5f94b5.25911.1fd7b664@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=5aa70e0478a472b0da9290d73aedf00428bdbce2 commit 5aa70e0478a472b0da9290d73aedf00428bdbce2 Author: Siva Mahadevan <siva@FreeBSD.org> AuthorDate: 2026-07-09 15:26:32 +0000 Commit: Siva Mahadevan <siva@FreeBSD.org> CommitDate: 2026-07-21 15:32:17 +0000 bsdinstall/netconfig: use a better heuristic for wlan dev desc For devices like the rtw88, they will show up in `ifconfig -l` as rtw880, rtw881, etc. We want to query the rtw88.0 and rtw88.1 sysctl respectively, not rtw.880. Chances are that there aren't more than 9 wlan devices using the same driver. Use a better heuristic to get the device description. Reviewed by: bz MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit c4b0b13cadac46b7c2cdfeeedeffa596c62568fa) --- usr.sbin/bsdinstall/scripts/netconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index 0f23ae134cb6..ea005430798d 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -61,7 +61,7 @@ is_wireless_if() { } for IF in $INTERFACES; do - DESC=`sysctl -n dev.$(echo $IF | sed -E 's/([[:alpha:]]*)([[:digit:]]*)/\1.\2/g').%desc` + DESC=`sysctl -n dev.$(echo $IF | sed -E 's/([[:alnum:]]*)([[:digit:]])/\1.\2/').%desc` BSDDIALOG_ITEMS="$BSDDIALOG_ITEMS $IF \"$DESC\"" donehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a5f94b5.25911.1fd7b664>