From nobody Tue Oct 14 15:01:06 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 4cmHTt3HSnz6CZH4; Tue, 14 Oct 2025 15:01:06 +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 4cmHTt2LLbz3g28; Tue, 14 Oct 2025 15:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760454066; 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=kYB0lHDlxDnRVYnjFGLn2tYoFNeBhfzFtjwpyXw6Njg=; b=b8eszHHBtDGPEPH6bnJ9Z2qf9Uu+k/K9WfGox5YoQDIVxbQaR3EYjR+HrfKC4yQFViFJh0 RFvi2Xk8dLoN4ky7WqTH5RchGLBg9o+BPGqrcQUo1XJNaD3ut/s0XojSGADgyT1rGB3rG1 f7S78qVV4Iuj4/sIWnL3O3S+V1/1fqBVqtI2rChmQUeRV3NeZNko8DYWZFThQNrW7plXtr UM+WXhmhprtaC+I306kQOn9aB5waSiMfTvZZo12vEEcu1TrPgXmioZ6idT3HJ1WHDZLK7t L8WkyJu5LvXoY56EFBIwPw5a21QfjkjLoquyXVWiKYVIHqNsrpF9UlANYWTTmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760454066; 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=kYB0lHDlxDnRVYnjFGLn2tYoFNeBhfzFtjwpyXw6Njg=; b=J7xWoaw1/67AU5/Mf+dIsZ4j1iUvJzwDAumTnMM+bPijEaUlIUMIk/UaQ4VcPaa2zXOh+s spICTTr3AOdQ9MvIh8ZsMa0jsImFCLG+dguCnxT+zELcpALEYPci/nnBYqSTQtYR/lYB9I bbGefXe8JszgKdB7rwKj/mZ3Z8BT0WjE66xlBWS8TMeSJr7g0B+TpixRyWpLwLTbzor7SE bumpmHkcYCXIWs5dlJuXouBz/7V/gu0GnY1lUHSylfKxfboDRpbjA//tvwJdY+/gYjNS+N P2XQDuZqZmIWRz7xRzYbOav63iRgJnnagmuppH+nlNDKMxxBjjQQxG2oLX4RWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760454066; a=rsa-sha256; cv=none; b=Nefd12kbJZHf1e802s6Wx4jxlUCBkzdvtPmKIp2VDgr3fXnclmTl3025/FNibKjziOxVB/ ZUO21Vq7Qhv/iCpQaEw6I2JxmvMM4IHLbYBj7FiIpDrsmWG5IZQ52G2nXqc39FeOQ39Cv0 EXqPtON9Z/aMq3R3R/AjblyIwN9R01w0ZbpP6X6dcuU31pc3aRY/8bft66OC05pQouAMlI qybhW5rnWrD6IGppRDe8fWSPgcnoWcncoYbgLDJCQUUzd1dfQN8gNyGA4zNnAp6309R91w +zAiOjcTdx1FzLJKMLGRMgybrvblLyGyDGVm1P/yam1iK8GkEZ30GOoeDuNzog== 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 4cmHTt1gKvzxN2; Tue, 14 Oct 2025 15:01:06 +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 59EF16O7019252; Tue, 14 Oct 2025 15:01:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59EF16of019249; Tue, 14 Oct 2025 15:01:06 GMT (envelope-from git) Date: Tue, 14 Oct 2025 15:01:06 GMT Message-Id: <202510141501.59EF16of019249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: dbd1e3229643 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: dbd1e32296437c9b2e3fb73400e59fda4adc3e64 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dbd1e32296437c9b2e3fb73400e59fda4adc3e64 commit dbd1e32296437c9b2e3fb73400e59fda4adc3e64 Author: Ed Maste AuthorDate: 2025-10-09 17:01:36 +0000 Commit: Ed Maste CommitDate: 2025-10-14 15:00:58 +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 (cherry picked from commit abd9424590ba37ac10e92723ad6428f0448024c1) --- 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