From nobody Mon Jul 21 19:29:37 2025 X-Original-To: dev-commits-src-main@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 4bm9Sy3Cszz61XXZ; Mon, 21 Jul 2025 19:29:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bm9Sx74GCz49h8; Mon, 21 Jul 2025 19:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753126178; 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=fASn6/aaSq25k2C0+sO8jd9PivHRHWFEjP52Cw2cfMc=; b=MW4LDjHxw739d/XaawabFdaCDUonY2pa7DEw3X8hiksuXOdLd2YFehangWV/7sjkhv7UuD Lhd8oDPPe03hTq5WOyFKY7a0KBZuh6IgiugINLQGbkx6xU/FktQKysl0gIiTZ45lGgzqkf iobzg2Q4Q7Jt5kuSeLcOZ+1IJ/806VG8h3LIP5LrAvjCtfvYRrqzjlYnIxuvwVV00C3TSs 43LmLU3YGQI85b7kul6ExtGhEMz0KChPtOnlKfbGtzP/pdCPm/FmAz4EJZ7B4jRuFqcfIF BarqTLdYud4lPITRAkjtqtAOqCATzuijpMhuReqTMUZB0Pt1SA5t1gantvkPJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753126178; 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=fASn6/aaSq25k2C0+sO8jd9PivHRHWFEjP52Cw2cfMc=; b=KE1LhExerLMmCMsKUWxSuVDGwDYduuApq1BYUP2hFSm45kOS120ip9BIVau6oGiqi1j9Fq W3VAboy33W05R58m/a/+QS6BIdTaZ/m9nM5qFnYgmP55PT9YaoYeX2B8r+DM+28oRqllX4 NUTHcbsuso8iPRrUNw/dD+BUwCu8zvqaBR+aUdeYzqUtu89qBBIfguATe099AUSOwPJr4A vTmRUtmWf17Df35WJkmfe4kOE1GKnCnpeYpVDCvyIFiUXW/kcXE9jKiu0tJwnqW48TGqnX DbliWeJMCzY8obm4FlcsTIeD5uhyKROgSB/CopPOJiaHO2Wc6ZHKgxL4aFOzHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753126178; a=rsa-sha256; cv=none; b=MpkoKHkBnLmPRZlwYrtcBbQNA3yEeS8XuNM+Q36KZYm5WQ99KdLhvp2Uxauj6UjBWqOAAP mD/uRYBHU8WqFUhXfpRliO5CqMZ/CW+3IS5LivuFKgBfyvw5aNBhUvSN+r3xGg3/E2RFe2 6jS2b7ZJWxlxv4VY3OEBtEmbZXcPXxvBwz/rnZmtZRe6edWAEPC6Qae9F7DVGiHH+sH78X 2nxGXPg+u8ud3jeOdiXBJsFxkCPLuKzqReg0W0Y8Oz5PkAvhhDlp6nw59BY8vGMu/IsPGx 2kolAXI6u20tThI474sffXpy+JGcz2VZ4+HbleQYyxIWC1W9ErrXe869ShYOTg== 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 4bm9Sx6ZWmz19Q9; Mon, 21 Jul 2025 19:29:37 +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 56LJTbmq062529; Mon, 21 Jul 2025 19:29:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56LJTbUQ062526; Mon, 21 Jul 2025 19:29:37 GMT (envelope-from git) Date: Mon, 21 Jul 2025 19:29:37 GMT Message-Id: <202507211929.56LJTbUQ062526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: cc413e2c04f0 - main - bsdinstall: Always install FreeBSD-base.conf if using pkgbase List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cc413e2c04f0b1456fd4636d33dedd2e01088f80 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cc413e2c04f0b1456fd4636d33dedd2e01088f80 commit cc413e2c04f0b1456fd4636d33dedd2e01088f80 Author: Isaac Freund AuthorDate: 2025-07-01 10:09:21 +0000 Commit: Ed Maste CommitDate: 2025-07-21 19:29:04 +0000 bsdinstall: Always install FreeBSD-base.conf if using pkgbase Currently bsdinstall does not install FreeBSD-base.conf when performing an offline pkgbase installation. This commit fixes that. PR: 287821 Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51101 --- usr.sbin/bsdinstall/scripts/pkgbase.in | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 1ff93afe817b..cf8e84de6923 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -234,12 +234,17 @@ 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 .. "/usr/local/etc/pkg/repos/" - assert(os.execute("mkdir -p " .. repos_dir)) - assert(os.execute("cp /usr/share/bsdinstall/FreeBSD-base.conf " .. repos_dir)) - + repos_dir = chroot_repos_dir -- 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"))