Date: Mon, 23 Jun 2025 14:45:14 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 47c3158b65db - main - bsdinstall: Skip pkgbase question if no legacy dist sets Message-ID: <202506231445.55NEjE2Y058778@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=47c3158b65dbaccf230de9c0caa876b864f51f63 commit 47c3158b65dbaccf230de9c0caa876b864f51f63 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-06-18 18:52:29 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-06-23 14:44:14 +0000 bsdinstall: Skip pkgbase question if no legacy dist sets If the install media was built without dist sets (and so has no MANIFEST file) we do not need to prompt the user, and only pkgbase is in use. Reviewed by: Isaac Freund <ifreund@freebsdfoundation.org> Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50918 --- usr.sbin/bsdinstall/scripts/auto | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 82e4993403b7..0b47d496fdbd 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -202,12 +202,16 @@ else unset PKGBASE_DEFAULT_BUTTON fi -bsddialog --backtitle "$OSNAME Installer" --title "Select Installation Type" \ - --yes-label "Traditional" --no-label "Packages (Experimental)" --yesno \ - $PKGBASE_DEFAULT_BUTTON \ - "Would you like to install the base system using traditional distribution sets or packages (experimental)?" 0 0 -if [ $? -eq 1 ]; then +if [ ! -f $BSDINSTALL_DISTDIR/MANIFEST ]; then PKGBASE=yes +else + bsddialog --backtitle "$OSNAME Installer" --title "Select Installation Type" \ + --yes-label "Traditional" --no-label "Packages (Experimental)" --yesno \ + $PKGBASE_DEFAULT_BUTTON \ + "Would you like to install the base system using traditional distribution sets or packages (experimental)?" 0 0 + if [ $? -eq 1 ]; then + PKGBASE=yes + fi fi if [ "$PKGBASE" == yes ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506231445.55NEjE2Y058778>