Date: Mon, 27 Oct 2025 13:19:17 GMT From: Jose Luis Duran <jlduran@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c75fa84200d2 - stable/15 - bsdinstall: jail: Fix DISTMENU items Message-ID: <202510271319.59RDJH4c011314@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=c75fa84200d226402e00da15c2e245744f26e305 commit c75fa84200d226402e00da15c2e245744f26e305 Author: Jose Luis Duran <jlduran@FreeBSD.org> AuthorDate: 2025-10-22 18:21:04 +0000 Commit: Jose Luis Duran <jlduran@FreeBSD.org> 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" ] thenhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510271319.59RDJH4c011314>