From nobody Mon Jun 23 14:45:14 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 4bQrTk2XQfz60Q5Y; Mon, 23 Jun 2025 14:45:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQrTk1S68z3b6R; Mon, 23 Jun 2025 14:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750689914; 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=4715/CpOSRn9QrOz8EjkAQfKClcvQVEt0IDjxco5JYs=; b=Zh5wR6qi5dooTnFSdVh5rrV6o3YtvxuuOFJCxTLDRCybSxObejr1ScHKbcbJz0RGZwcWNk UOeSU21CiwOjIkufxc+SwyNx0l6G0IMVtfEorN4hR5m4vGJ2Bg5zVszaKQ38e8y4uh95Mm h6be68Dujt5XGtDLr66/F2oxbM/fMcKUZfpnxGjl4yTAaoEjEYqVJxZiFaysvHJFoZxeH/ t3mXSy3pTwuRT9oQ/Y2a6UF66i0EEQ7/m4kA7b9CCd0cnKyYa31NKMqelQRehDdXEfPB7h 3cX0zfukfP74kJjr1hDOXh6eK2o9gkMCgWjDPJWBFVP9rFZvOGaWOr+9xxU6Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750689914; 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=4715/CpOSRn9QrOz8EjkAQfKClcvQVEt0IDjxco5JYs=; b=U+Hg0LOZJnMX8jUqfMTi2aMl+Fsf+epI2wrt4Bz9knAAw4U6UYkN4POmu0t/XRRNYtB9xF 6Jg6knAlMZicN9bTTW8VEFva537Kfh3sIWofACGTcUsVUA80J+chFghN6ZWmiOYUiFSoVp L56DOzlox3HYRGXuglY6srGSIH594TNmNsAPitXuI73z+KFbDtAIESR0itB0CPEbB2boLn KZP4+bepdcI/dwAC2NWSjXWVhtei/5XynhYKS2fDS15QtY5TiTu+cFunPHovmLEF53Qegw 5JdzlQlUcr0GubIMOICkseo+MOH/NsVaLDXZkNOAMFyzNsiI8Fu7zJl394ma2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750689914; a=rsa-sha256; cv=none; b=Lu7EcBH/8eosUm9x7gqBLbrjCmm4bpPOHVUeSFx+nljSXGRdVXYUiNV/2ku1iqprjsYwQ1 u4+SFNLJlBqyX9/REVmZFALGnT26njh/FvJcj2xXTRZO2tFwdMsxxASbgrxPveZski1JMI bFdu/HBwJs1nyY+eM0naO1QT3+KjdbrPpPUy+lxpywLAM7vkrF4e4bBXbj8jVGzO8zEe0s GzvMYi4aVmhffqMNxE77STGLiJJs/8ezmpXqC9fU/NoMH6tHte3NmbbJcRXkqlVKPtGm3b CpbYWHkrVUT92m9mdt5qNwxjFY7WauA61NvoGqE9ZH8q49GLiRRf0T23w7u4tg== 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 4bQrTk13Txz163C; Mon, 23 Jun 2025 14:45:14 +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 55NEjE2p058781; Mon, 23 Jun 2025 14:45:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55NEjE2Y058778; Mon, 23 Jun 2025 14:45:14 GMT (envelope-from git) Date: Mon, 23 Jun 2025 14:45:14 GMT Message-Id: <202506231445.55NEjE2Y058778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 47c3158b65db - main - bsdinstall: Skip pkgbase question if no legacy dist sets 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47c3158b65dbaccf230de9c0caa876b864f51f63 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=47c3158b65dbaccf230de9c0caa876b864f51f63 commit 47c3158b65dbaccf230de9c0caa876b864f51f63 Author: Ed Maste AuthorDate: 2025-06-18 18:52:29 +0000 Commit: Ed Maste 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 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