From nobody Fri Oct 3 01:08:15 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 4cd9Wz4Y4jz690sJ; Fri, 03 Oct 2025 01:08:15 +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 4cd9Wz1zJNz49gF; Fri, 03 Oct 2025 01:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759453695; 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=8mjsv349m881iXbuLdj1OfMc8lCuDO+DUsZRdRiMNqk=; b=uuYKRppCizzFQp3v7oojAKZvywGh4OxtpLsq5jArvHfRJpEa3g/sncaHy2ouXgVvsUIrWW JbThawpE48ODc5Vf4MkRzFXBzm3FtgsJ7urmklUVNNoSV/9aXzhDwe/A6LoF00t7s0ZL0R NLS1Lo4xC9UhDa2hKatR77H43ntx92tXA2WXUVrcSioycg2Rrt9h15icMttbZx43m2uwvw Zro7mJzlu5VbbOadR1IRz2JyQwmp+uLDEvN7VBIaZ8QDGpQSnN7npzhwXUBLZU65bq6o1I kEFWl6/pWCGzFw1OJIBvsypFn13JPvBBQ9hbv4px39Hm4ihsBEMJUlLaG1JOSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759453695; 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=8mjsv349m881iXbuLdj1OfMc8lCuDO+DUsZRdRiMNqk=; b=l5ft8Rqrsv8LXD1ug51EwGhPk9H6NTqVBmpy9+1DK817vU/V7QGybvb4D8yCnKxtGEyuWT SXgmZq2rzM/0y7jmXLmMcmg+fa6ugXCfm9nbcXy1ZzsRV1IeYf8kKgL4kgw7vW3u8SggzT pqkOZSVgO57jakvqygPtI5a4kmBaVdfvZ7GOa5vZ67GPcx2J7+dvn1nHERDgNhgz52AHdy g/3cPbl7kfg98rJi4WO/hH86Wt2HPTtIFvLkrUMb++TYkT4zOCEgsMVtKH/lcbCwHuypZH RwcqipzfCk8I5z9bng6pnFdiXu7YKi+qmIn4qWYdUhkXwLDS+0SeOgX7Ro0mOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759453695; a=rsa-sha256; cv=none; b=OdnRFc1jPUq0T1js6nRnIrBsdtvZg0Q4ZKn87EAhdSM2u/KLU99F4iu1ScCnIgiluCUKmX 44RJwDuMyfDS5Z/LQvT6o/7ykA6h9vD/QoUARDtgiU77Qccfq+eDVb1Wz1VbzyZ6FU1/cT O+6pYR/LR5/kGppQxemOdXGlndxXDcBy8Yk6a4eGwW+Tek5HTL8PFsgB0kpeXbh8d7bMrQ kyEQdPkneqR4jY6iPzUFNL4jkJBQsfugGFt0hNNxzq2rh2v61d5Z59ixYMHcUOooNEJjEE 0xQ61V7FPpM8ZMr/JccPccNJzJVOrpe6Ank1o8KIBMxJUcFHTr7x+z4LrIj1Ig== 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 4cd9Wz1XQ9zYp2; Fri, 03 Oct 2025 01:08:15 +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 59318FkW072929; Fri, 3 Oct 2025 01:08:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59318FQN072926; Fri, 3 Oct 2025 01:08:15 GMT (envelope-from git) Date: Fri, 3 Oct 2025 01:08:15 GMT Message-Id: <202510030108.59318FQN072926@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: 86221f965c06 - main - vmimage.subr: Fix NO_ROOT build in ..._rmcache 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: 86221f965c06efa1cd5b2da640ae23edded7c8b9 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=86221f965c06efa1cd5b2da640ae23edded7c8b9 commit 86221f965c06efa1cd5b2da640ae23edded7c8b9 Author: Colin Percival AuthorDate: 2025-10-03 01:06:44 +0000 Commit: Colin Percival CommitDate: 2025-10-03 01:06:44 +0000 vmimage.subr: Fix NO_ROOT build in ..._rmcache When doing a NO_ROOT build we can't run pkg inside a chroot, for multiple reasons including not having /dev mounted. MFC after: 6 hours Sponsored by: https://www.patreon.com/cperciva --- release/tools/vmimage.subr | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index f307e7888e93..fba09d532b4a 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -250,9 +250,16 @@ vm_emulation_cleanup() { } vm_extra_pkg_rmcache() { - if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then - chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ - /usr/local/sbin/pkg clean -y -a + if [ -n "${NO_ROOT}" ]; then + ${PKG_CMD} \ + -o ASSUME_ALWAYS_YES=yes \ + -r ${DESTDIR} \ + clean -y -a + else + if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then + chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ + /usr/local/sbin/pkg clean -y -a + fi fi return 0