From nobody Mon Jul 13 21:11:37 2026 X-Original-To: dev-commits-src-main@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 4gzZqs4wv8z6lnbm for ; Mon, 13 Jul 2026 21:11:37 +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 4gzZqs3BTZz3jNF for ; Mon, 13 Jul 2026 21:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783977097; 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=ylEZa0EedmZfzKZzozVNuqc9Rpkzx4VvJCDg7zxGYzk=; b=wXQO3hqDWZ+6o4evelCIUQexFgX0WTwOzNg28DVIjxJ3jU+1qiwbi7JDhAJXErvc1NcBU6 KVyHCqGHXbUuFJPHtMmc1IaGUjK6AFVplpfYYc22ZgooFSW9qwHm9wJ1P56XWLmdStn/yR xzaKi4s3MoBlYnA6hXjf+rQ6ZQNZx5GXO+ntK1fYZNoT+P505eUhend3wuVz6r+FSIYoh1 ZJ0dRc503eydWKZPS0ck9k1EN4xtvwACoP4enwpP12y+S4KL90U1wDiY5/eBCL68REptVS ys0EKnbnuDaobn79Z9AXq8b/sNt+SWBYOlUxA8pnFZxnS9b4jy6i55qmMtxYsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783977097; a=rsa-sha256; cv=none; b=MNBjVsQKs6aXIrxZGDv28lEt0l4cpefQi5dH6VHX3hgygyF0g/3wRKtcxNpxhDuApsXZpL ovZvAKLcO04ZaNBYW5Tma6zcc0/M78B5rce/hbWnrLO6WPZOXT2pd1iN9c6jDb2DmzewZY SFt3HtXG4hAnSRoADpLdZf19LbM5QG8d6CbmRW/C4FIiqhaGVg7jSXety+65BAWyJwn0D7 I3aql0ApsjSCiVyWN4tj03EeYpqo8ZHUr0tQlHGaWTsfNkHAHRhrajx0XTdyU1azVbrvB0 Nc9lO0Pzglox4/cXSmXEpyi978wayIRphSDWx3iXkd+MgoWT5nVr3jL+LIcBhw== 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=1783977097; 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=ylEZa0EedmZfzKZzozVNuqc9Rpkzx4VvJCDg7zxGYzk=; b=lbYeUL7IJxHDxIfp0OgbIspHhfrXeeatxkvkDni5Sxu07wIotBzHJjOymFKSMz0bmy891y KvHeIGtQ4lT8Hqbgf677tIjtgOg1BdwJn7wchYqNJGH+/3C2zyMjo9dhdo+ov42FlNWRKO E9J08SAPIshhKJVYmiKeEBNLPjXd+zWP0eBWEq30EPxz6rOF6bQCj6mvUoSoi5J8uoYF0h +DAQo/FEkaDxtsulbQW5Fl6Kg/2xd21yl/TVM+sznW+4+KE2zVe7hhwPk6ivYVBof7WS2S pZA2SfPE52e09AGcKM+SVHpfqGLsMLcXnb51O0Zt76GS0KGHGxnz/Kl1jjSmew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzZqs22nfztD for ; Mon, 13 Jul 2026 21:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c532 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 21:11:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: c4b0b13cadac - main - bsdinstall/netconfig: use a better heuristic for wlan dev desc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c4b0b13cadac46b7c2cdfeeedeffa596c62568fa Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 21:11:37 +0000 Message-Id: <6a555489.3c532.16ed70f6@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c4b0b13cadac46b7c2cdfeeedeffa596c62568fa commit c4b0b13cadac46b7c2cdfeeedeffa596c62568fa Author: Siva Mahadevan AuthorDate: 2026-07-09 15:26:32 +0000 Commit: Siva Mahadevan 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