From nobody Sat Oct 11 17:22:44 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 4ckVmh3Rztz6CBtv; Sat, 11 Oct 2025 17:22:44 +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 4ckVmh2zS7z3T5j; Sat, 11 Oct 2025 17:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760203364; 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=kEf1BL2hLaZn/tn7mbCKD9IJOD4LDAwnUX8yDs2nVaI=; b=VfuNLU0upp4y9otc9Vi9fRm4gltkKllPm7O+xjp9KCF45dsiZMIi6683gC3zBqINJF2Rm8 CSl6hnp6dyzKNmIeyXo8hvXK03cf32MlBb+Zc6XUjYzJXcFIgoO2IS0k+gwxhUD2tdNs6v V6+DRIzC/TZGX9sIlwpKRQvxj9jR/2/UL32wTxzN7Y6uGdkN5Xs5kS2gqjjwj0Hp1ReTum GftnMLd/ieBc09+0gbZdQZy3EUSlpwk0f5u1qA90YN1PJLY1tVg9i2wG+pSB7jr41Sd3oM imuC6geeNPcODePeq+ojZNqpwBWzcz7Yzl67OrddFndGZVThdmDFmUIzgE8dNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760203364; 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=kEf1BL2hLaZn/tn7mbCKD9IJOD4LDAwnUX8yDs2nVaI=; b=EQGtzrEDXNCPskegzc9NWAtyLZk1RNKoaLCSFsjxFAYRAKD88MeeGjrcxvIho0iQZ3sTRk GK9UZSHpJ48nx+akcPmAq/eNs+lqFLD3Smmzz8fiAPzVDoovSoFQZdTLvoeR8zdqKZP7QX jN/ZXeP9ZBISZlCaRGs/yftV/nav7QxlCvVmlYYegEGD+VNkdvzqXW/Kjl3vnn24wsb+DU KXy2ZSfSd+bJRPrz9ZXzxoNcbnNcbUDj6a19smZPCitHZcuonJicI9kAZV/LIKhTGxerAP FAEHwYja2Je7ptX8gSH70z7/Vi7A7Ff8chFsO76NA7/jsmx0QyW5JD9+Ylnoyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760203364; a=rsa-sha256; cv=none; b=mzykbUUyiRFUCdZDHDVVKVhZzVza84mckYTjhpGourCNyTToI306UCy1mgMHIMOeUzbgZu YiFZ88FWdzcrifOoCs4di4nVRcQf8xDaT/BKStpqPeYZwh6gyTzdCAKNBqmlq7qYFpS9eP IXWryYtXB9zFcYt0ilx6tLD9/V5hIA7NovuMaRpMLMMaeuNYADYoSdm/nqa6n/NsL1j1pv 7WBNnxsRpbjb+DRnr40+g/eeA5wIBhz7jI71LM4rjeYa0DS6TcWpoIvBenF87eFqLMWgod wiaGnR+rlyeo/ZHcTx1c9t6rDlPedP01/jXcRonW3ZUHZZ6SAtYn1KZA5VTvWA== 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 4ckVmh2Sp5zkWv; Sat, 11 Oct 2025 17:22:44 +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 59BHMiSl039790; Sat, 11 Oct 2025 17:22:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59BHMi6P039787; Sat, 11 Oct 2025 17:22:44 GMT (envelope-from git) Date: Sat, 11 Oct 2025 17:22:44 GMT Message-Id: <202510111722.59BHMi6P039787@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: abd9424590ba - main - bsdinstall: Tweak pkgbase/dist set labels 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: abd9424590ba37ac10e92723ad6428f0448024c1 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=abd9424590ba37ac10e92723ad6428f0448024c1 commit abd9424590ba37ac10e92723ad6428f0448024c1 Author: Ed Maste AuthorDate: 2025-10-09 17:01:36 +0000 Commit: Ed Maste CommitDate: 2025-10-11 17:22:19 +0000 bsdinstall: Tweak pkgbase/dist set labels Have the button labels refer to the artifact type directly (distribution sets / packages), and use "Tech Preview" as packaged base is no longer experimental. Reviewed by: ivy, cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52999 --- usr.sbin/bsdinstall/scripts/auto | 4 ++-- usr.sbin/bsdinstall/scripts/jail | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 61d52065af2a..8058b1a41dbf 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -209,9 +209,9 @@ 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 \ + --yes-label "Distribution Sets" --no-label "Packages (Tech Preview)" --yesno \ $PKGBASE_DEFAULT_BUTTON \ - "Would you like to install the base system using traditional distribution sets or packages (experimental)?" 0 0 + "Would you like to install the base system using traditional distribution sets or packages (technology preview)?" 0 0 if [ $? -eq 1 ]; then PKGBASE=yes fi diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index f2c7ef2b37de..3b1b2ee98fff 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -175,8 +175,8 @@ fi if [ ! "$nonInteractive" == "YES" ]; then bsddialog --backtitle "$OSNAME Installer" --title "Select Installation Type" \ - --yes-label "Traditional" --no-label "Packages (Experimental)" --yesno \ - "Would you like to install the base system using traditional distribution sets or packages (experimental)?" 0 0 + --yes-label "Distribution Sets" --no-label "Packages (Tech Preview)" --yesno \ + "Would you like to install the base system using traditional distribution sets or packages (technology preview)?" 0 0 if [ $? -eq 1 ]; then PKGBASE=yes fi