From nobody Mon Dec 15 18:18:23 2025 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 4dVSwv1xFwz6L7FN for ; Mon, 15 Dec 2025 18:18:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVSwv0Z9rz4Km8 for ; Mon, 15 Dec 2025 18:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822703; 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=XS4w1Tea38xtHiKa8qdrW43F9Zg5mtUTCFRHKgoXC7w=; b=vMPGrG7LG2MPqzeWkCN+lwOIJ33N9LW+sHzWSycWAgWc/lM3BaVrDFPCeCP9xa269+uThU RypV5TDsYby6VDLI417UM1eZcQg1srK/kPoRWomcXhPrOi9xPttCIBXeGkpWM/p2j/sLdA A0oTMtV5rm4ZRnnXu3SfWG71CWcmlZklRUiknDitLlccz9Gi2/AyUhly7E92yAnUQmtsbD RN3vHlUymUizZkcd/mHn/2HON2QFwDRcfnB2nbWcNKIZS9iBNRexauktPD37ifQAt7ReWl HXgcOkgO2M2bkmZt/f1GNibBkq8HtSYZIiYXHnnJEety8vzddgRRbtqTM5VIEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822703; 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=XS4w1Tea38xtHiKa8qdrW43F9Zg5mtUTCFRHKgoXC7w=; b=PW5ynJfcSYsyuPpfP/9Z9nRoUlMLpatQnFiiveO1bRXrYfBDPli04UR7iZaY1oQucWr45m Za0fJ04Gvg8GJJ4g+j4NKuOsXwWBGqMFvnokrUSjuLVR63SRRDSmPJ19WGXqvD477C1B0d +XPN2hcgk+BCtSgJp3b5qbekYAU2WvjvoNGg9PicsBn5nl2rRt5Vk6JYC1xnNvxElm7bfh 3/oLoT9s7YFtShTH+K/+UzJI7kO17uBfVG5pH7SxuoGtfgn81HzWOpZa2E4Kxa4/P6EwhZ AgqR9j/k/sUTGcRl8HyKxAMNQs/5M4WgavXxaOfM+9nD7jIN66J0/uvz1lzFcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822703; a=rsa-sha256; cv=none; b=mLDM5T5aNkbrI5rpO8GAa6PWdgPafFJqG+3L+2yaUzcHROBUBhdp/+uhvx7Ir3jIhHzALW M8iK7vFtIgzPPb+Hb2IaIcqthBWtps7gGhSIaPQk2kBiTXLEc8ffn4DDkT+ax9rYwrLnOh oe/pAoxwyQGv+VvbezMfDZ63wBLiqiy3K/p6eA+JH/KpcDprXecNGWtjSIoAjWHq+LVV5v pJLhHu2Bu7iy8QcC2WiXBFW1euKOMSunOE7XDCNGaqWpbr0dPLykrC2Id/oMa1NvAFpYds p4PwPoIrJmxCBhvo4o4TgwDchVdmi7V0rB1Cfy9y5jesW64OdIJPcEl2ETxi2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVSwv01SGzWkb for ; Mon, 15 Dec 2025 18:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 232fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:18:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 919db8472a3e - stable/13 - bsdinstall: Fix netconfig script when no interfaces are present 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 919db8472a3e88e7da79c522de1f0a16c4c28c7a Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:18:23 +0000 Message-Id: <694050ef.232fa.3616a127@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=919db8472a3e88e7da79c522de1f0a16c4c28c7a commit 919db8472a3e88e7da79c522de1f0a16c4c28c7a Author: Jessica Clarke AuthorDate: 2024-02-03 01:52:37 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:34 +0000 bsdinstall: Fix netconfig script when no interfaces are present The script uses [ -z "$INTERFACES" ] to check if the list of interfaces is empty and will exit early if so, but INTERFACES always contains at least a space due to the way it appends the list of wireless devices. Fix this by only adding the space when there are devices to append, mirroring the behaviour for non-wireless devices above (both will result in a redundant leading space when the list is non-empty, but that one is harmless). Fixes: 159ca5c844cd ("Adapt to new wireless scheme where base wlan interfaces do not show up in ifconfig anymore.") MFC after: 1 week (cherry picked from commit b809c7d6a26924ac351e49a15011da718cc3feec) --- usr.sbin/bsdinstall/scripts/netconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index ca39b225841b..91852db3276c 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -46,7 +46,8 @@ for IF in `ifconfig -l`; do INTERFACES="$INTERFACES $IF" done -INTERFACES="$INTERFACES $(sysctl -in net.wlan.devices)" +WIRELESS_INTERFACES="$(sysctl -in net.wlan.devices)" +INTERFACES="$INTERFACES${WIRELESS_INTERFACES:+ }$WIRELESS_INTERFACES" is_wireless_if() { for IF in $(sysctl -in net.wlan.devices); do if [ $IF = $1 ]; then