From nobody Fri Oct 3 16:53:49 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 4cdZW15y5Lz6BBmb; Fri, 03 Oct 2025 16:53:49 +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 4cdZW13DmYz3Hdt; Fri, 03 Oct 2025 16:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510429; 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=pziz4mzc+C9vSwrr2cC5xBmtQO1CafwDyKgi0OEnsfY=; b=G48KCXI/VRADQtGprnd0pncdmghn2BDpJvZkwGiL+rwGF8itZpLJUiVgE7UKQYd/rW/4wj 80j7Kpd4TrV6qhIRHVm8g0IGetSu0KGqh+px0fY7fRmPlZR8AE8Ub56MpfauiUfRPobR4U BX9uyNQuXwwGr5T6Qe5xyjwVwysFWtYUHiNoawVuJK6cvxJFd7WCNpfcenEY9TCly/JURb c9EI6avlV0FMArYAhDCoDMwykNnmG4TaV3uyxQv5stD7PHLsDlKod6c0HZt3XO+vEI6OeC DYUzhxF2rOxDGIrkg3hiy6FekEcsU2Fu5CZgC9DGAfDnPd9MiUc194iq1FlJqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510429; 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=pziz4mzc+C9vSwrr2cC5xBmtQO1CafwDyKgi0OEnsfY=; b=qlP3L2qkUpwBEq/nL+aHWCgT4dhwhcCNlVYnnFzTF+kWgu5LDito0m0mCQbM59YITT/CZV 1m761CjbVNcAzWFWL4yvv9Pgbi9BWhcjK3X+xtcN2YH8kZujahi+xpse6bUu6F+wOI+tLH ZCQjXgeW0vZLi5oIm/6PZorYLNsegalSNnX2qiLGMSOflsNaYUMc9g6zeVeDfZ4glH5Vgx Im6LuBZ8edlvz+Z5ZGp+5BbMntDM/vjJeMmfsEXUAlNUD7V169LAP3qh/rB6cseIEne8xH YQZzFtENXLG13uMkv69nmFTmu5DSzIuMw6A1NoVr687l6cuaGfqgcqNtk6iJSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759510429; a=rsa-sha256; cv=none; b=wP2W7U7ytbZD1DUvrueVoE2xUI2L2pYnOr35qD9rJKyJ294C/cMsViyxORjmal1Zr3f9Ra 1fdWXYterOCEtpjgo/3eMUSvfrPxQ9O7biPcojxw9rY/F+aH2cSG2sN6id0WgwgBcDK4Z3 3WceWlUGb80fPNnLWX/Bip5ydUIBC6jWSX6PEn/HV9rVMk27BVh8ZhM/NOXbgo5mhHDr32 2fQkSOWvOKBr3gw0S/cr+vGHwGc66hHHwnnD2585cGDQLkaJCbpbZ0ZIh18CxkNedzcYsi h001z3T0bJk/wjDISJthrwzFlw7GU691TlAQMkSWrwvMDU7MO/+G3ukWWn/lfg== 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 4cdZW12njPz13bR; Fri, 03 Oct 2025 16:53:49 +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 593Grn1q064408; Fri, 3 Oct 2025 16:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593GrnLP064405; Fri, 3 Oct 2025 16:53:49 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:53:49 GMT Message-Id: <202510031653.593GrnLP064405@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: 627511cb1e84 - stable/15 - vmimage.subr: Support NO_ROOT pkgbase 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 627511cb1e842844a0897f19b81e13fed208d2fb Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=627511cb1e842844a0897f19b81e13fed208d2fb commit 627511cb1e842844a0897f19b81e13fed208d2fb Author: Colin Percival AuthorDate: 2025-10-03 07:23:43 +0000 Commit: Colin Percival CommitDate: 2025-10-03 16:50:37 +0000 vmimage.subr: Support NO_ROOT pkgbase We need to tell pkg to record files in METALOG; otherwise when we create the VM image it's almost empty. MFC after: 6 hours Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 08b497dc6c4da23be83f7cd51edff07f09d63fd6) --- release/tools/vmimage.subr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index fba09d532b4a..27cca78be6e3 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -95,6 +95,9 @@ vm_install_base() { pkg_cmd="pkg --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR} -o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes -o ABI=${PKG_ABI} -o INSTALL_AS_USER=yes " + if -n "${NO_ROOT}" ]; then + pkg_cmd="$pkg_cmd -o METALOG=METALOG" + fi $pkg_cmd update selected=$($pkg_cmd rquery -U -r FreeBSD-base %n | \ vm_filter_base_packages | vm_extra_filter_base_packages)