From nobody Tue Jul 21 15:58:02 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 4h4MVM3zjpz6m7SP for ; Tue, 21 Jul 2026 15:58:03 +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 4h4MVM1Wj2z3sCg for ; Tue, 21 Jul 2026 15:58:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784649483; 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=OV6QrsDwzO9fActa94T2AAJ9w/MgZcGDgfd4aZYoASw=; b=CvyP08Kl8g6XtPCntFNIxmTOp/LgBZf7C9zMpaVAcXkq3Bm+GheFGzsWbd8EQydGJbwWe+ lUdIPXkn6mpfTvY6FHz5cKmKb2mkt2cOyuEbMRNtdhPS1y9jp81klnLGEcp1N3rUlXy5tt eAqQ+uXmR0Lly+nOuj49HCdt+L5zeLmSB7egzsgRCHo8+JF2erYiJXbUZOmxoJAqYlppe0 zTLRBx19VTU9/M7iE8BLbkZzMlj5x4XvBz28iF4Jn4RqlDadU7ZA6IJmRzbAJ3WOI9dKBL 9M5fZa/727eQLc0GyQkZxnTSO0tps6MyCaamfZEtcLHM1NExy1UrbF33Z7PgMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784649483; a=rsa-sha256; cv=none; b=OD8YF8Ve00Xc0ZIVDktEvi3KdaBQ6ZxpW6v1YS4dIet9pKmrhWSvP+P0XjVY71D0w+KYxX XlebcjvXkCcmcPQuqDm9agxxdv6TnMnC50SYe5IEFEZGn3zyy9mLjv8O5xktn9uoH581My RF2fMfAh1xvMLRSjS7nES86tqXTobrlJIgD8ea9L0wsnewC6TcOq7LMjC/MGzsFRcGJbuK chcSPaLEGBkoUwubOT/FARMGdqaMInXwe1Qg/3GYM+2VfO7VNOeyS2/Meh4Eyj7t5Y7eix sVECOwsY66vvVpNQYlRzBl/fKPcsLPIZYV4D02kCeOi3cQbu1csVeCeZf1NZUg== 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=1784649483; 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=OV6QrsDwzO9fActa94T2AAJ9w/MgZcGDgfd4aZYoASw=; b=EoRwRolMzfRjVQ7aI6wrDtYfLUSyEchvIIJKImUA2Dqq3D4yboX0O3WD6HMirTJZu7NYdq IFdCqsPvD9S9Dst4zTIAZTZHMute0API7HGIxQ0wJwjewroFtZx08pizFogpxLqTAHehK3 6IfUWH7lhLbAz75jgDhnR1/Wq8FJ0g2UmEi+vWWqjl7neSI1tqmANWPWRR1gQfd+tcMkQE Ha2GoZxjac3VuPp/6o8+XALoAvl09KPiu1a2Mrc+nvSlLSWj8DXVrJ7tH3cUR50m4cYO/E 8rdIkNPJqablbQfGOWwAWozWwJCbvXT+RWEpwZBTZJEB7tGp4M+8UTdMyj+G8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4MVL70VdzvXD for ; Tue, 21 Jul 2026 15:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25942 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 15:58:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: a14133739978 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: a1413373997814e1f363dad4a276acc160655a1f Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 15:58:02 +0000 Message-Id: <6a5f970a.25942.736d1d35@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a1413373997814e1f363dad4a276acc160655a1f commit a1413373997814e1f363dad4a276acc160655a1f Author: Siva Mahadevan AuthorDate: 2026-07-09 15:26:32 +0000 Commit: Siva Mahadevan CommitDate: 2026-07-21 15:48:36 +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 19644898a66a..66950664c9e0 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