From nobody Sun Nov 16 03:11:59 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 4d8GBS2505z6Gpnn; Sun, 16 Nov 2025 03:12:00 +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 4d8GBR6TZGz3my9; Sun, 16 Nov 2025 03:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262719; 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=aJbeXE9TlmjFL/bI3ddGi9AZVcmSGz/VZtvSReYC0s4=; b=iF2Uw5uaKX7Ye2d/HmTya5yytmRrui5OpqfvlOSzuG1W9GxZpgaP0pA34hA3+ZXmmpIokj 9L1ApL7RFJtHE2qI9QQduIXi0AICLBoHvtwNvjpTseyacWhO0cOKuhdFve0SU1e6H+Gay5 KpB8gLyXdy7TSjE64mBXszOCu7HSL73763ID97TYaGwS00BINAQDjZ3oS6UAh/PJ5HBqEJ HEeYG+VBlNZ1QkdNpfSWr8J4dTkyVEvepTtSr4DT6qVjELBShbIJzvDTWgbrectkZVvPS+ YtbIKAL+rNqg0pAgSsXQccDbo3wRmQOGi43LOcWLsvhA0HBqd7hbGoGnfKa4/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262719; 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=aJbeXE9TlmjFL/bI3ddGi9AZVcmSGz/VZtvSReYC0s4=; b=ucrpC9BPem4Vt+tWAo8coq1XatBTQ23Ugp1zERukSet1UTSB3JE/JIFYlgKGOUabV7wjEl p7IRTmY9keiLY80RZ7gCNeAJ68mZzMcbjUMJdjYWjCOs4JvlldGK2FHCMx24xB+OmDPVyv prbGBDzsq7uZdYetw6ISykYZ43deNEx6OZKOW4oor3nM2c2goZ8WYEvIataOA7bqDq6dmN 0LlXy1G+bIdjMge17P36Ci4Zt8RawJa10FdrC6kd6Ve7HzMnBtpmVD+E+/gE7FAwiMmsXB eyDRwIdEkXfhktLjWaN2chZoxyWBknbEzLWySh/LG/TXsnDVJHXgUWUJRa5xlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262719; a=rsa-sha256; cv=none; b=TbN7EFNTAXlwrloD9UBI7Ct4I/2fxhXOieTNuBmgOHO5XVC8kJgrt0ZOi8ubDOmnZDmd0h acN4i9BZgvBW+L+yue9K3q0EYVZ/Ucf6QC52zu1yvpEYkhg/OE39PpeoyytDXMFn4UZgjW Imk0Tyr5XTj99KPSszbDRDIO6h/ooTAAYiEZV2RvChTnLeJ+Fhu5KiKR+TAKgDTIuU6gXT 23hHwfZEZry2K+iG5NyDa1JNv+RjUUwKCjK955Z0d/9uyHbLvi+xxxoU9Y/zJnyAIGv0Sr QGqEFW3ud9QRjRMr7MmM0Q33io4I8+DLNSXNH6BTTIND+eApNC7+ZxtGIDQ2YQ== 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 4d8GBR5Q2dz5Zb; Sun, 16 Nov 2025 03:11:59 +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 5AG3Bx9V091555; Sun, 16 Nov 2025 03:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3BxvN091552; Sun, 16 Nov 2025 03:11:59 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:11:59 GMT Message-Id: <202511160311.5AG3BxvN091552@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: 1b859fdfc7f1 - releng/15.0 - bsdinstall: Don't install FreeBSD-base.conf 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: 1b859fdfc7f1209bc96a87dcbe134d422c2d6c62 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b859fdfc7f1209bc96a87dcbe134d422c2d6c62 commit 1b859fdfc7f1209bc96a87dcbe134d422c2d6c62 Author: Colin Percival AuthorDate: 2025-11-15 03:18:52 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:10:57 +0000 bsdinstall: Don't install FreeBSD-base.conf When installing e.g. 15.0-RC1, we want to get files from the 15.0-RC1 pkgbase repository; but running 'pkg upgrade' after installation should get the latest bits build from releng/15.0. Approved by: re (cperciva) With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit bdfc223c7a64369ed133a179c40067435a9f2cb3) (cherry picked from commit e4bc038ef80607ad9ceedb52e059ebc061a2a8be) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 744e0daac6f8..ddbf8eaf4f86 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -309,7 +309,7 @@ local function parse_options() end -- Fetch and install pkgbase packages to BSDINSTALL_CHROOT. --- Respect BSDINSTALL_PKG_REPOS_DIR if set, otherwise use pkg.freebsd.org. +-- Respect BSDINSTALL_PKG_REPOS_DIR if set, otherwise use pkgbase.freebsd.org. local function pkgbase() local options = parse_options() @@ -323,17 +323,9 @@ local function pkgbase() local chroot = assert(os.getenv("BSDINSTALL_CHROOT")) assert(os.execute("mkdir -p " .. chroot)) - -- Always install the default FreeBSD-base.conf file to the chroot, even - -- if we don't actually fetch the packages from the repository specified - -- there (e.g. because we are performing an offline installation). - local chroot_repos_dir = chroot .. "/usr/local/etc/pkg/repos/" - assert(os.execute("mkdir -p " .. chroot_repos_dir)) - assert(os.execute("cp /usr/share/bsdinstall/FreeBSD-base.conf " .. - chroot_repos_dir)) - local repos_dir = os.getenv("BSDINSTALL_PKG_REPOS_DIR") if not repos_dir then - repos_dir = chroot_repos_dir + repos_dir = "/usr/share/bsdinstall/" -- Since pkg always interprets fingerprints paths as relative to -- the --rootdir we must copy the key from the host. assert(os.execute("mkdir -p " .. chroot .. "/usr/share/keys"))