From nobody Wed Oct 15 19:49:05 2025 X-Original-To: dev-commits-src-branches@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 4cn1qj5hx5z6CtyJ; Wed, 15 Oct 2025 19:49:05 +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 4cn1qj506Rz4N8X; Wed, 15 Oct 2025 19:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760557745; 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=bCoRsK4S+EhHWJOGGrKUjMDm0SqmeiGVWQuO/nU7KsQ=; b=oxKC2IHit1DOuk1dPlWIuVxJv1VoknBSAUC1Klk8zKAWEGO7NiMQteqdoOUnzRs0/adO/d O19yWZzw9P2uATlYzD1GEVtGC2Oi69adQ/uFPfCb8H1ts6xxR9jiZHdLTt5lAHLlghnemH lc+9B+oGWZ8CxN/xY9XUhidnvT34Et0yBNroVDlzZDX3Noj998PzoQKysnnRvfRN/qPmTC 1+fAuX/7OgFyNMDtHe9NXOckmF7+Fxbl1haGmwCX2gE15yJGtkcSZ3DzZjuCWPeiw35ZB+ Ew6PD200ffWfd0viPuh4U5TOgupK9Skh0/XDAbPElgel2PPcmLV3pZUbt8HG4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760557745; 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=bCoRsK4S+EhHWJOGGrKUjMDm0SqmeiGVWQuO/nU7KsQ=; b=cTOxzzfORyfjni60Xi8jw7159SqZqNvuZFqcfX39EIcm7s7n6hK5NKFWocr7jJu44EICRE KjNnCuLIsQtjsh+SQpBl9Cszfn8a5Xf4n8bvIKF5fs/8I3bm547ppEm3ScSb8sAOa9pPFW 6zeHAnwLqgnqSWhSH8LACN/HTB7jovzz/ak0BsQkOAQMZU6oYjv9vfHjnMirAqMl1Yy2AK OY6SV+7Ddl48aoWcekUmfYRG/8sTjLhiP/K0/ttXYsDtHLPKQ2TFEQU8ZiLi7OJmMxmmep KaJQnq+i3065hQTsIr4cQ5xLo+OTLOEdQXSjkpDhSxfiFK4BFwjNOf4wb6783Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760557745; a=rsa-sha256; cv=none; b=mRK7K0UwdibyR13oNMEDkFFid0Hy1O8gFeLZzQmZuH9uAoRA3qHoI1KH7L6ic4fO6tJLc/ IWTL+CJpvZSth7iTJ2iXK6uiLOV0dEwOC+SRspuA5u24GAJN8XK8IeEPqAr97vJDjjHmfN J26GOdhqwTJr7PG3eVOKpGXnDizwq7BdEBfUKpmldypXaGtq3hthuYJGQz66Hb/auKhyjB aeEI76EnTkywvf+x3mNF9jQ7EHPg5iE3FcfxJlTIIydSqUk8jTHaRVGyVr0SwLZ7+PBlP5 ygIYOrtI1BVX2qL3ck77vGdeZPmJrOHGgaUjh1O8Y+eQfl/Ri2w07p3MHBuqbw== 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 4cn1qj4W5tzsYX; Wed, 15 Oct 2025 19:49:05 +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 59FJn5uC069452; Wed, 15 Oct 2025 19:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FJn5Pq069449; Wed, 15 Oct 2025 19:49:05 GMT (envelope-from git) Date: Wed, 15 Oct 2025 19:49:05 GMT Message-Id: <202510151949.59FJn5Pq069449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c307343246b9 - releng/15.0 - bsdinstall: Tweak pkgbase/dist set labels List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c307343246b98dc6cb3b4b8fdf4ee19100176372 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c307343246b98dc6cb3b4b8fdf4ee19100176372 commit c307343246b98dc6cb3b4b8fdf4ee19100176372 Author: Ed Maste AuthorDate: 2025-10-09 17:01:36 +0000 Commit: Colin Percival CommitDate: 2025-10-15 19:23: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. Approved by: re (cperciva) Reviewed by: ivy, cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52999 (cherry picked from commit abd9424590ba37ac10e92723ad6428f0448024c1) (cherry picked from commit dbd1e32296437c9b2e3fb73400e59fda4adc3e64) --- 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