git: c4b0b13cadac - main - bsdinstall/netconfig: use a better heuristic for wlan dev desc
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 13 Jul 2026 21:11:37 UTC
The branch main has been updated by siva:
URL: https://cgit.FreeBSD.org/src/commit/?id=c4b0b13cadac46b7c2cdfeeedeffa596c62568fa
commit c4b0b13cadac46b7c2cdfeeedeffa596c62568fa
Author: Siva Mahadevan <siva@FreeBSD.org>
AuthorDate: 2026-07-09 15:26:32 +0000
Commit: Siva Mahadevan <siva@FreeBSD.org>
CommitDate: 2026-07-13 21:09:43 +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
---
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\""
done