From nobody Tue Jul 21 15:48:05 2026 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 4h4MGs6fk3z6m6YM for ; Tue, 21 Jul 2026 15:48:05 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h4MGs5mMMz3qn8 for ; Tue, 21 Jul 2026 15:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784648885; 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=YFDm0jQDkGAP9j6w1UNdn58MRezoHUvLoDEmYO89w80=; b=mWLwylp4YmwIPw1e1DjrYC1cmlMyU9VvLVrvGC02k+T7uJDm1FEAIIxcx3BEFnUP5QnFra PLPB/DDBK8didT6oUHoM6m3vg27jYH4P79013n5KFu3XoNhzmkMLRVDK4Tnox6JxcVwYn1 3f12E1oojmDFDmsCi3jOCEaB8RflvfhBG2VRemTfnbq2Zo13SB3y+anFLkQyqSBCy/yy/h CwjhcrQmefyGL6e4q3kOFXX1i3egb3o/x+WtcgNNqao+klJYYlUARUli+4zTBqbx4iWrqr 2nzZIRcTzoPVY0DxahXUlguhZmiZz19vQ9qhpO9vTx2GQffmeW8iBiDZTwCfZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784648885; a=rsa-sha256; cv=none; b=QQXWJl/j6kkPf/hWnSXAUOO6UufBZWpAXh48i4sIKv4FSYz0/IiLV//ieQnszmbSB/oC9w 7Pt5B7l9BAV7nGW8b6ZnusICDz1gGcmBzernsfs1d0V8xQkhG3r03MHAeEw+HmODyfUeij qvlCZQf0XuPjdjHuuPUCXLQj+hDa3CVqq3MyX0AG/nMSy0lDnU7tROZb1VWmQQS3HEg0uh 7N7duOSWxqGTHNQTvCPF3kNU395fwl2NEOngqBABWCC5aH4+8FA1a+ahZobbNlNpUGs8wc bfZl3YZfg45TueSwdFTATJvbiUorlVzgzEXOMqrlFZEiCPIAv41syi2z/Bw7cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784648885; 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=YFDm0jQDkGAP9j6w1UNdn58MRezoHUvLoDEmYO89w80=; b=G5h1foynpYIEJ1+D2TazJVh8V3pDSoak5bXtKPqECnng+bRSSWHgWsmeeZ+uetham/Qm1Z kTknmBwN6TtWMXn6kGRUDkj+aI9PbU61jVZDmWcM3jcrcYDH62cou0oMfDPF9rnQTQ7MPE LmEUhJOZxJAW6A5hRErM0KpLyA4J/Q7eMBETa1shNpG/ZKRqZTpfNQEZ26ZSCoZrDD2ldn g/ULEEDfeWV6C7pD3Kwcet1190ZZvZyENu5Rg9kmIZKT827NvUYzBPCE7SRMinkfvNT8UI URxsqFjmb8VBJiBFWE5IhBtgj3qFE7cEk0Vy0fWtas9tMPW8R5snc2Gj97QN0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4MGs46nXzvP2 for ; Tue, 21 Jul 2026 15:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25911 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 15:48:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 5aa70e0478a4 - stable/15 - bsdinstall/netconfig: use a better heuristic for wlan dev desc 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5aa70e0478a472b0da9290d73aedf00428bdbce2 Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 15:48:05 +0000 Message-Id: <6a5f94b5.25911.1fd7b664@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=5aa70e0478a472b0da9290d73aedf00428bdbce2 commit 5aa70e0478a472b0da9290d73aedf00428bdbce2 Author: Siva Mahadevan AuthorDate: 2026-07-09 15:26:32 +0000 Commit: Siva Mahadevan 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\"" done