Date: Sun, 16 Nov 2025 03:11:59 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1b859fdfc7f1 - releng/15.0 - bsdinstall: Don't install FreeBSD-base.conf Message-ID: <202511160311.5AG3BxvN091552@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b859fdfc7f1209bc96a87dcbe134d422c2d6c62 commit 1b859fdfc7f1209bc96a87dcbe134d422c2d6c62 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2025-11-15 03:18:52 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> 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"))home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511160311.5AG3BxvN091552>