From nobody Mon Jun 16 22:47:22 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 4bLlWH2NRwz5yWX7; Mon, 16 Jun 2025 22:47:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLlWH0kv1z3H23; Mon, 16 Jun 2025 22:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750114043; 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=vqKpVdv66dWylm35CjLm6LX1zHzemcNZW2Z59aa6dbw=; b=sHShO9CPPG59z65rq3X6Uwf/cRILJ4+3gi52kaxovLVwjpg0JcZHJIkkFoAvN7HVGQYC7X agACJScEK8vMmNVw4yADf4DbebvA/4qm3ZZqS6UaSvl4zCUSW2EaR77i3sW9G822Ue3IuN zIvVNjpY2t/GgOJc9l/1JWRjdD0vEhUem3bgPhzCgsQDmYqLrVRW+gG4LP7jVtvPfmcx6m zXXKw/lIFef6qX2s5BHNtHNRuePZQSDjB1PaLv5th+yYja1WfdaSWApg1hciTMaQ0dGenZ KQ70EHHm6n8FyLaG1L1vgJbfEWiUEccJdCGB74caFZfXbn+mG0Z9WGCU6m1pxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750114043; 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=vqKpVdv66dWylm35CjLm6LX1zHzemcNZW2Z59aa6dbw=; b=OALjwOIuKv4RG7gN/tcCJopHUlH1vSVzvuWYBuMX4vAUuy/IMO7PuDuw7hHvmoIuFJHorH IyvxqEmA8dJ5gWXHn7AcVwDxqpgd1Yj2l6Qk79UE/906h2xXmUFbpSygMVNZw0tdWkFptI PgH7J8a3no25pvnbnYb/m8eJKLpM5/DYdBgbR35z7Ci/EmvnrJ4gT1F4Pt383KpvzgeZZS TlVE9fP0hsa4Icriw8+U1CrEHKZ5EhVuSFxw1qJboBv0Q5b2kt2lk5sie7NJVOk7kJD9e9 Ucr5N+O0PWfwjGlLCPNsk1mX4q+x+TRRNVS+/ugp8lQjBUQxg3BM+CnAGhDeOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750114043; a=rsa-sha256; cv=none; b=muiyciUXPK/yiaX+LhJwu1C7tS4pFTmEARzCbSS+AzmBqoqn36091yVescZu7wzXgFX2i+ wFrKFDmdYa51HIqgpaEiEBd/z8ZktMf+QAlp/jAOpaI0DENENb5x55RifoikzqidAm+H5W 2kyGuWJxUJ1eTz6zaJQ7Pu/iJ3EOekmvs3xyiRxJgilzLrffd60GVtsm3a52IPpqZaD/HH Fu55Ve+ZcbfWc+g/h2jPLJLMUEWZOBWr36zDFf0s4TvImBV9CatJf/p5401EMK8BsIk+MN YdD06Zq4vE4cZCesLdAvTbBNdCViZpKs55iqgpldimgHTl8X3l5I0tORAx+Lrw== 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 4bLlWH0Hnbz2Ps; Mon, 16 Jun 2025 22:47:23 +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 55GMlMTs004538; Mon, 16 Jun 2025 22:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GMlM4x004535; Mon, 16 Jun 2025 22:47:22 GMT (envelope-from git) Date: Mon, 16 Jun 2025 22:47:22 GMT Message-Id: <202506162247.55GMlM4x004535@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: 9134ed157388 - main - bsdinstall: Default to pkgbase if media contains base packages 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: 9134ed157388f3e34374322a5de06449a031f1ec Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9134ed157388f3e34374322a5de06449a031f1ec commit 9134ed157388f3e34374322a5de06449a031f1ec Author: Ed Maste AuthorDate: 2025-05-22 15:24:59 +0000 Commit: Ed Maste CommitDate: 2025-06-16 22:44:57 +0000 bsdinstall: Default to pkgbase if media contains base packages As of commit 62d18f8c4c10 ("release: Add -DPKGBASE option to include pkgbase packages") we can include base system packages on the install media instead of dist tarballs. Set the default for the traditional/pkgbase question to match the artifact type included in the install image. Reviewed by: jrm Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50467 --- usr.sbin/bsdinstall/scripts/auto | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index d5ac14864d6b..ef92dc13a5b3 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -186,15 +186,24 @@ trap true SIGINT # This section is optional trap error SIGINT # Catch cntrl-C here if [ -z "$BSDINSTALL_SKIP_HOSTNAME" ]; then bsdinstall hostname || error "Set hostname failed"; fi +if [ -f /usr/freebsd-packages/repos/FreeBSD-base-offline.conf ]; then + HAVE_BASE_PACKAGES=yes + PKGBASE_DEFAULT_BUTTON=--default-no +else + unset HAVE_BASE_PACKAGES + 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 PKGBASE=yes fi if [ "$PKGBASE" == yes ]; then - if [ -f /usr/freebsd-packages/repos/FreeBSD-base-offline.conf ]; then + if [ "$HAVE_BASE_PACKAGES" == yes ]; then bsddialog --backtitle "$OSNAME Installer" --title "Network or Offline Installation" \ --yes-label "Network" --no-label "Offline (Limited Packages)" --yesno \ "Would you like to fetch packages from the internet or use the limited set of packages included in this installation media?" 0 0