From nobody Wed Oct 22 18:23:37 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 4csHbs3kxjz6D4Ht; Wed, 22 Oct 2025 18:23: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHbs2fsHz41WK; Wed, 22 Oct 2025 18:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157417; 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=+MuydRM8hPoU7mksjwefcFQEzl7AK1Y70zAsl6+0C4E=; b=SSkn7yt/KIwzuTDknIp5lBTcHJEM1eeESrCH+vuu2N9CFBhEc5T5IniNw2KRKWR0pkyt8N hosfz6boiUoqO8Jzqj5sYg23O24YxiQ9PhgFZ8XO1P/a9TDuFxa/xM9OMzOetDpqFFiHiE SYRyphms21mojO/hlSuNObqWafQioBfDlDMDRW7jCR2igM2cQ849JwHBCL8dlAVPORIVCg ki2L1VGWU1fz31IAv4xSOsMB/9iQmnPKN4q5n02G6hCZH09YJIGKsks9I7/X+voFfrFBx8 Ayu1xvWnx2I5i8m1YZ/+EVEgIe/Vnx4Nueb+mTlQIh38JHcXJSaQ1DkdX+fMXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157417; 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=+MuydRM8hPoU7mksjwefcFQEzl7AK1Y70zAsl6+0C4E=; b=ryI77QkG32ttbb6FJKf+ldh5ddXfmx/SStSUHkYLyoAhS7NKwyFuSrYNH/40UEteZD5fN+ 3z345lauvGiDfJDFayKCEmMv+K2sLfYtMHxiSNQCkqn5uk9LAk60MaIxFzcFDNnwdzHwV/ TDgHqn7RL7fWBB3bsvU5SU1rygTcKq4M+xkA5qRcPFXCta4kXAZzamnKmiiCD82mpJERxW QUoouxUgb9q11/dfMB+hK3+zsJw/UzxD39FdN9s9eHkCv8pR+1Xw9GXsAB8CSh1XUoUC1J hW0C17g7YNT27zmZ5JLlZttRID0L5rVYbH4QsnmaemEAeRlmAZyf7DsjYtFang== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157417; a=rsa-sha256; cv=none; b=N8VFlRxcFWR7+VXG03dPQIjHeCkXX/+dhgbbyv1aOGFSp8aZ/vjEVcTSstqh9XQxvFNTpT 03VAdKND0C854jyyh/JvJy4VTQjXzbSgMlDyP97YGT19xEDWxGJggc+MQULT4y8cEDErrd 3SW83a1eLGxecCRY6xyPaMQPvvnldUx5+H6HI8dKi5Q0hhOk18e8cYTDDTxoMmp71N0O2Y HaNFf5wp6DnO0g0GClRjvPuU92PtVNXshrcJf6YklHdLP8PHxKv8XZBJpB5BZTvtTcsOo0 16uYTeYPhxthQo9ad4SToWRqRgBv93gQ+rc++9t04Y4O6gi/jNKoIqNpFlhDtA== 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 4csHbs24y2zgnM; Wed, 22 Oct 2025 18:23:37 +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 59MINbEL023737; Wed, 22 Oct 2025 18:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MINbY8023734; Wed, 22 Oct 2025 18:23:37 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:23:37 GMT Message-Id: <202510221823.59MINbY8023734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 74921426d552 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 74921426d552f7491c61684465f964b446379dac Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=74921426d552f7491c61684465f964b446379dac commit 74921426d552f7491c61684465f964b446379dac Author: Jose Luis Duran AuthorDate: 2025-10-22 18:21:04 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 18:22:44 +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 --- 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