From nobody Thu Nov 12 23:41:51 2026 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 4jQcNw0yb0z6xnNS for ; Thu, 12 Nov 2026 23:41:52 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQcNv5jgJz4RqT for ; Thu, 12 Nov 2026 23:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794526911; 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=YfDmRsyQdoLdRBDu+Tb46/zYwaLwTbRd+q7jvpQZMB0=; b=v4FWvK91OWh27IjVr0TAl9j6GMTWLCAEmvQenVUKSGQDUtJoIFOyq7moPyde02nlPBGdNg 8lHYq4EkOkIShntzM7GNYF+B8F1rNKUEK/93M38lg4KkkJJ+r+RDt53XMYMxjhLIW/1Olw 4xsog3v0UhTOdVptMPwz+N83Q7RQlidS0PcFFKG6bsJE6ySp0f/HYVe2d8MRBHlrgoWPKk Y520dK0BWCMExzuivZxcxM+ZGQzl3g+3Qd6/8jTjMjnaeuo+q7gu0MLph/2+WuNrnkeQRB YJUjb4fsbGtFrnTn+K48NgUf8+LQ1cnCJFfYdRDzg4PhJMxDyZlCc1FhSpnYBg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794526911; b=XZgJ7XHs0+A25uVmf0QUUYPyARiRcpm8q4KvG3gLz55yyP/+hU3OYeqkKC+OARJ+JXq2uB I4cexTlQgaln2RsCRRcCF6c1Abv79AiGvL+p+kUq5uH3DUSUtffW2/ZRMCZQb02UH4MRPv xOBfZAys6Y7ZDv4y9bWYGtlJqEdnaBRW8hLAtnCka3x3B/BPDsdCSoAoGNCpQOzyhTQY/Y /X7tQ6aUVKrPvZQvw/xKTcT+UmlVG5Rg1eykUeQhqoLj3XU/iHKTab4AyO9fqB5LdKfqY9 kE3xPnPnEnFiW7lX5UJCMFBGbR7soZgEL3ZcD5KCj1Vqg829wC1dWrbEhrf20g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794526911; 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=YfDmRsyQdoLdRBDu+Tb46/zYwaLwTbRd+q7jvpQZMB0=; b=NOhBceb/2G/YgWAzLfLWN7e/J5x1tG+odKhAaYV6n9P//yEt2nYCxFUtNc1y7++slFD+mE 1Pi77pG6/uA8b7+iABGaVJkRMvjBz6sWokeCl5QtYxl7EQxkT5sMoiyZ2YP/o5XWhPBUMr vV3IMx11cZmC/1j3JD8q9iimlMc24UbQWlbn87GSEVBeKJ7SDelixuIooBPRdqg17Oe0J8 +Vekuyeu7mxmyO1X2VeGiqh/gqcTPQNaEAvn7z0sGinVIPwRI+3g2Wvow/cClmnvftGTQT 8nDBxrdKMeDxxgn1jqnQvl/dCU53E1H8TsFaDs6twmzT0Ru4VDkvXQJ4zIK9gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQcNv5BYYz1NKK for ; Thu, 12 Nov 2026 23:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f8e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 23:41:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d3c02201f9db - releng/15.2 - bsdinstall: Set TMPDIR in pkgbase install List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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.2 X-Git-Reftype: branch X-Git-Commit: d3c02201f9db71a935ccaec1a45f025a096a1de9 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 23:41:51 +0000 Message-Id: <6af64ebf.f8e1.27a31ce1@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d3c02201f9db71a935ccaec1a45f025a096a1de9 commit d3c02201f9db71a935ccaec1a45f025a096a1de9 Author: Colin Percival AuthorDate: 2026-11-10 02:34:43 +0000 Commit: Colin Percival CommitDate: 2026-11-12 23:41:17 +0000 bsdinstall: Set TMPDIR in pkgbase install The FreeBSD-base repository (aka "pkgbase") is now created using 'pkg repo -l' in order to make 'pkg rwhich' work. Unfortunately this makes the data.pkg file considerably larger, and FreeBSD 15.2-BETA1 fails to install using a remote repository since the installer has a small /tmp (20 MB). Run pkg commands with 'env TMPDIR=/tmp' since the /tmp in the system being installed is considerably larger than the tmpfs which the installer runs with. Create /tmp first so we can ensure it has 1777 permissions. Approved by: re (cperciva) Reviewed by: bapt MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D61380 (cherry picked from commit a7163bd76986282fdcb059b91301d3214da49642) (cherry picked from commit f3555a0e240ae2b26fdf0db2e3f68ec6846bbb58) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 2c7d6bcae904..b872e9ad8d67 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -345,10 +345,15 @@ local function pkgbase() assert(os.execute("cp -R /usr/share/keys/* " .. chroot .. "/usr/share/keys/")) end + -- Create /tmp and point at it with TMPDIR; otherwise pkg uses + -- /tmp which is a small tmpfs in the installer environment and fails + -- to extract data.pkg. -- We must use --repo-conf-dir rather than -o REPOS_DIR here as the latter -- is interpreted relative to the --rootdir. BSDINSTALL_PKG_REPOS_DIR must -- be allowed to point to a path outside the chroot. - local pkg = "pkg --rootdir " .. chroot .. + assert(os.execute("mkdir -p " .. chroot .. "/tmp")) + assert(os.execute("chmod 1777 " .. chroot .. "/tmp")) + local pkg = "env TMPDIR=" .. chroot .. "/tmp pkg --rootdir " .. chroot .. " --repo-conf-dir " .. repos_dir .. " -o IGNORE_OSVERSION=yes " while not os.execute(pkg .. "update") do