From nobody Fri Oct 03 07:25:16 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 4cdKv05jV9z69mhM; Fri, 03 Oct 2025 07:25:16 +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 4cdKv05BnQz3t1H; Fri, 03 Oct 2025 07:25:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759476316; 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=o4UN293TD/cjx6p0/j53Oy3E2SmNeNoyfiu6hWOY3G0=; b=bkPPTsxG/d3L9oWmugKGPzzLTEs3/Eg9gxV4eOD0bbZX6wGvj8/ms+pTjiK/O9IC6nDXys Mn1SWTS3s3WCgVrb0eO76dPvuIEhV1C2XD1SDrQQ3mxMF7FsBRPfFZkrRSw9R/STpDT58/ RjJy34FPbVQDfdYR45hIwk//bs0JAu/eBVOZBShmMuYV5yDQ5A0iBOUKHA+XA7FWRu2M8E 4xFpEuIktQHYTRZfWQGXUsHUZqjg/R+tFTgkFAK9Kfdj30KvtgT0llI+IFmeJMxO3b84ge UCKpSQiEs2sKpxSjq0glCbSe6XXok941GdGe1+WPjvVXbDSxImeqhrSEmewwPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759476316; 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=o4UN293TD/cjx6p0/j53Oy3E2SmNeNoyfiu6hWOY3G0=; b=UJQIFHQWNlfncwsqVse6ZezGAkmjP1RFVz/XrQ7RL0FML2tZUz2kTn6AFD8mD4ENgDd5zz YKTyxuRA++Tr8U5RDYicguEUvH3UXu8u7L3zGAYC8JDMucUAmKXMf1Th5rd/cqiMARXAhz VpxHPopjD+L4owXp2vBFKSrFcBYaINXjx+Zr6pFS6ZPT8uV3LS7r1CHEOCqZ5mH4Ousour pL57HCmyhSknvfWsHeha1w3xKEex7gI1dHFWpUXPDJpnR4WtWAh+wyJbYbquc93eOiD/SD Duz+ukcoH7OGvq1wtGslll/bnFF3ahJBdhz87PKqNstcL/foUtBOA2klZJ8YMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759476316; a=rsa-sha256; cv=none; b=nZyVwKBIVCAuvfMa6MQm1k/0UNAG3t1l6F8Ewj8/FGUrSY5DmQZDY4KFCEWrlqHPS909BQ 5uceUH6UDpbo0FYOwGHGYyQNfvZGbnBe3UnYOxPEhigbzqWpg5Oq1RuzwLtLQ37IjTeS6e SvqoN4w2u++nwF3NEXbgR8+tOXTuJxw7EBrncs5uLxswT9fiOEPovK3RBSpLhcjlOgLHEv 7kvXMOgAQVEBIXsHks6JvVrj3AE6BjGRyJer/qg+FmdscvJ8DakqG1ykcejpcUlzZJmThN AOGsvL1vX6OQzRMwUFyxVzQdqNFeu9WaW5LsJOJxm5HTpSdSSqiY+pRGyFbUKg== 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 4cdKv04W7yzklb; Fri, 03 Oct 2025 07:25:16 +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 5937PG9b089506; Fri, 3 Oct 2025 07:25:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5937PGqq089503; Fri, 3 Oct 2025 07:25:16 GMT (envelope-from git) Date: Fri, 3 Oct 2025 07:25:16 GMT Message-Id: <202510030725.5937PGqq089503@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: 08b497dc6c4d - main - vmimage.subr: Support NO_ROOT 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08b497dc6c4da23be83f7cd51edff07f09d63fd6 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=08b497dc6c4da23be83f7cd51edff07f09d63fd6 commit 08b497dc6c4da23be83f7cd51edff07f09d63fd6 Author: Colin Percival AuthorDate: 2025-10-03 07:23:43 +0000 Commit: Colin Percival CommitDate: 2025-10-03 07:25:05 +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 --- 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)