From nobody Mon Oct 27 13:19:17 2025 X-Original-To: dev-commits-src-all@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 4cwDcQ1HKVz6DbsJ; Mon, 27 Oct 2025 13:19:18 +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 4cwDcP4Cljz3Rkc; Mon, 27 Oct 2025 13:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761571157; 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=hPc0p1xQ2xo+hUgqmy3IgN7mWr0Ai7f3/CMB/aqC2rc=; b=q+2EqAVL+QnNUwDNNK60WrW2xhWyDLPR4iZqo81CKAXtaRaSih02xG6XZwWsZ+Y7hyQDMQ t6h+j9qLIeKeeEPXIpjoKJet3naME4ynX1pk1/fJCU7TGm/1oricPtZomPyjvSJYLM+Ec0 kI5eaNI/uo+mI5hNwcsnFEjczQVO2SblBqI01BCsfufpWAd2KudVUlpCpkP7vbaBo2exxW GRLQM2aGtl+lCJLYFwMCuOGTjiWWutoopNZSUPN9PvwxHTPm8yFvi6KY7ZbaOSzosi1oFy xDyawsXSO3i9FwJmilp2TV69hg+D5ts9pS/E2G1J1hrhykt+pxcumn3jjesikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761571157; 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=hPc0p1xQ2xo+hUgqmy3IgN7mWr0Ai7f3/CMB/aqC2rc=; b=bhTP4Luko1wlKTo8WLTHHjMaB3DV0W9JyzVP6nQp66eo2EnKEflZTd50VWwmsA3oA+o9pz KeAVgDyeiCQAmgZtBgNqnUzlElDzH2MPJsvkLKAtT/PZg4h2aIfvKkhN/XTYuMGv6qEbZT L5acTs8Dg/bGqVj0AyqmlE3CH6BCwumyvywA1jo05Znalb2f7LD0EZUaWVSJamZY35BOR5 QjotalS93v+KatD/QSKqg6ECSfeA9I8crsOruLi1auZ/kKiZBnfCUh9psoDWYN6si/BQRj asp9wULhTlsUP6X1VRFYH8iDqfju9LrhkUfNUI7712M86n7stcoO2Wnu91ex1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761571157; a=rsa-sha256; cv=none; b=ZpxgSt4/sVBg7HSqOqyIS7ce0FiMWnpGZAfArp3U2vs0pr0byytj/c+F+q3WUMjhZLgePH hrRWIJgZ7ZeEjtx8DGl4UFs0pDtO6ACok6R63z7pTUyQprgVkjMcyWZLRziU82L4uVjjre 9ey4niEXyvTFHsIXrGubtqa+6lQKjyeitN34ep3QziafGpiAcIUfCnU9cNfGFa3mxf9354 JE8VraRP3Ue9y+kMN2ZbJTjMvT21897ni5W6RNFit3MgDIPkFOFgRUsNdJC3+nbJ7OHrXk VSEOfZkUET1o+lZwzIoBgGJ3cJpbzAVtPK7JjK4M96plynWTr7NftWsYA7rw7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwDcP3d1Jz1KKM; Mon, 27 Oct 2025 13:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59RDJHJH011317; Mon, 27 Oct 2025 13:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RDJH4c011314; Mon, 27 Oct 2025 13:19:17 GMT (envelope-from git) Date: Mon, 27 Oct 2025 13:19:17 GMT Message-Id: <202510271319.59RDJH4c011314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: c75fa84200d2 - stable/15 - bsdinstall: jail: Fix DISTMENU items List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c75fa84200d226402e00da15c2e245744f26e305 Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=c75fa84200d226402e00da15c2e245744f26e305 commit c75fa84200d226402e00da15c2e245744f26e305 Author: Jose Luis Duran AuthorDate: 2025-10-22 18:21:04 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-27 13:10:33 +0000 bsdinstall: jail: Fix DISTMENU items The menu was incorrectly using the fourth column (distname) instead of the first (dist) of the MANIFEST. The actual file name is on the first column of the MANIFEST file. Remove the .txz part of the name to build the menu options. Reviewed by: jamie MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53177 (cherry picked from commit 74921426d552f7491c61684465f964b446379dac) --- usr.sbin/bsdinstall/scripts/jail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index 8e001fc4a027..e4238ac0a687 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -79,7 +79,7 @@ distbase() { : ${DISTRIBUTIONS="base.txz"}; export DISTRIBUTIONS if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then - DISTMENU=`cut -f 4,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base` + DISTMENU=$(cut -f 1,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base | sed -E 's/\.txz//g') if [ ! "$nonInteractive" == "YES" ] then