From nobody Sat Nov 15 07:58:58 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 4d7mc25rlfz6HKcW; Sat, 15 Nov 2025 07:58:58 +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 4d7mc22jcrz3P3G; Sat, 15 Nov 2025 07:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763193538; 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=n4oYtg9Fo94zCstdZcS9Xj8362SOqcZx871etM8s+Bs=; b=I87IYeX7YkS6QPBnTq+46RGCzKO1zERbbwYlNbLbtpNW+BNvwnE5mqm8Rq7aMVXYLIo0NX dxcN85//jVc5SJX2wpNY878QhAXyhVtONZd2q2ew+7cMqB+dQal5mXiCpzHxLKtDfN1VDd 6mIBqI2Y7WjXcWuYS7dP5a0WuMCdgx+8sm6zR/UPx3V2pJhgCg54t7vXzfKYE/dXx6owaV sNw//ezhR6KMuwbWz/EmnOqQBpW2tv2qljI/3/XCydwKGwWH73Yy9a0QZmeipKJQO09HEk zc8qTkDNdGbAeFKjcChKpqU2GIZUrV6DqB9SAS+82uueFeCbmKX1tLeoFdOapQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763193538; 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=n4oYtg9Fo94zCstdZcS9Xj8362SOqcZx871etM8s+Bs=; b=MOSqLbZVdQRGFX8QmV3gt8yicG+rOyjutx6sQM5tkrqYx/UTl/uCCqCFuSdyLF03XNkGwx 5j2Axd+112aie31qnMVJvGYn4IwyW3LtXlGfLh8jfiWQ+JNoiI8MeF8zFB9Ah3DqDj4l4z TmgzpbESZ6+sRguz/U9r2MR9In5doaorPROMON8jswWPD3TLaJf99/tvc5BJ/xPMV9nUFr HyFn8aoFT9lqIP1aJ1iMCllwkS29so8WJ1jIfXtJkZpjGe8c+0AydTFK3lDPZjMEFwYFTs IA98xn/8F0JLUSZvCAMWqoPqMfQC1M0walx0r2b5hTp2AJZ0nvv5q5b/w7gBgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763193538; a=rsa-sha256; cv=none; b=fUqVx/avXDwxqpqNVOlFDhPplaa4TGexKXpxFy89PNNOgg4bL552qNPu9jASYmfP4r57+W YptbeOoG1TEUKkEKX/Q5pS5VZOTouu2sAFK1Urcj+gNGu4uX6qLfmgYJDRaT7It97IdOtP +JMFsCMXF/HqN9jXPxgdYLN2B4rwPE0ne3RI/zKPDRPLli7WZ/dWCOyRRdCkKIQFOv6DHO LD5RwVhUh2gssJsT06QUjdMa9Ah98kCp0Ay1A624HfLFokfkbFlEykoM+OvwBnZnoxWAja xQpFU7fRrVa8wq4Fg9BG9K8D9p2sd6wYrQIF6d5O6ui4dDgLcrWqeCXf++z9XA== 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 4d7mc2222hzkPw; Sat, 15 Nov 2025 07:58:58 +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 5AF7ww8Z013501; Sat, 15 Nov 2025 07:58:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF7wwpT013498; Sat, 15 Nov 2025 07:58:58 GMT (envelope-from git) Date: Sat, 15 Nov 2025 07:58:58 GMT Message-Id: <202511150758.5AF7wwpT013498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: bdfc223c7a64 - main - bsdinstall: Don't install FreeBSD-base.conf 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdfc223c7a64369ed133a179c40067435a9f2cb3 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bdfc223c7a64369ed133a179c40067435a9f2cb3 commit bdfc223c7a64369ed133a179c40067435a9f2cb3 Author: Colin Percival AuthorDate: 2025-11-15 03:18:52 +0000 Commit: Colin Percival CommitDate: 2025-11-15 07:58:41 +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. With hat: re MFC after: 8 hours (needed in 15.0-RC1) --- 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"))