From nobody Fri Oct 3 16:53:47 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 4cdZVz4bP6z6BBmW; Fri, 03 Oct 2025 16:53:47 +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 4cdZVz1y9Hz3HYT; Fri, 03 Oct 2025 16:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510427; 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=AGIo1d92/NZBLs7RDwdFAFZXaOnH35KRGj8cEFKpuJ4=; b=T9Uc5D8xlNorXSI9WRSobBpi+hGoliUVUNmD8Mdd8E6ofqC5VdL/vcNQOFRnDh2/zYYxe8 /fBHaUe8bjQJpH8e0t0apkEsVLe9IeWhEFIgRpcRRsCpdYahvqsG2QgBG2hWntHc3PwVfh PrF0jKk+AZ/oNL9PCu+FHyZtTKxUaJ5Y0L/3+5rt/urGBeyQQFt/iTeWTiHAqQms4BiwOW pyRrM20g8nxdcalNaagKK9vSg5tgtS/UK1cBe2WQ95s/jh8e0FO5MpOIf/QJ+H2utag603 +1cB5xrJV4Vnu+a1g2SsoM457rMfCn6cIJwR1YJ7rtfhMnYoKqk0wXSbdc+CEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510427; 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=AGIo1d92/NZBLs7RDwdFAFZXaOnH35KRGj8cEFKpuJ4=; b=GhFHO/NLqjhWixrgtgYb1GRA9X+J6CMONgKyKm/o/XOd7l6Dbzhqi9/CAYeLbIV2sFbdJz f3HeNsOM/ZQFL2HBmhz93bfNqKznMCiC/U3lEBtGHFIA96vmubEdbSNIC6wV1ZHxzG3SHd daMbhgeKB/R6cyBWepF2Zy3Rcy4zvkVxiWiH05m+JdxJoxzPiKaCcl5BFIx5X9MqxOF8vU A7YZnHadwHJ9ZFqqjuj2qfCdyYTwOrQEbMFMYr7oQjdlpa0ggGjUFr3PWlE3QYiLc5ahn0 Ex5zZl4OLzhq2J9t6Byt7n/GRgj6TgI6PR8FdFdg+LOYdN7oRbaV/qf5wrQg9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759510427; a=rsa-sha256; cv=none; b=rnQDhVdaIgHSb9DxhXDWjeED3ei/6+jLCibVbtlBRIlHxRwhCQIwODvxpwubAfq6a0Ff88 ovRY3tNOUWFYWSakdVMsWC3DY5V2m7ja11E5HpxBjwKwm9RPskeGzzGOv+PrM1p65F4z5B jg6vTY+hlRuE3q+rXSIzHToCz7TD86fyxj8DbLItuAq5ediv+JLdJyEcCFdkD1HiOHidB4 9oz5h6JCk1Xj3ko2GCR1V1Hzj9bdVdGrm2kLJyevagTIN7cAjgR8XkeYvj0yZD/a3iWxbW IZqD85ePx6w0yCHsic0fvU17DVDJqLlotlUfWNCsx+kkqTiDU4eRiPQDNFRxfg== 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 4cdZVz1YtJz13bQ; Fri, 03 Oct 2025 16:53:47 +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 593GrlGu064338; Fri, 3 Oct 2025 16:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593GrloK064335; Fri, 3 Oct 2025 16:53:47 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:53:47 GMT Message-Id: <202510031653.593GrloK064335@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: eec0cbd26887 - stable/15 - vmimage.subr: Fix NO_ROOT build in ..._rmcache 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: eec0cbd268877912c6f2a4633ad1c34c357d6370 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eec0cbd268877912c6f2a4633ad1c34c357d6370 commit eec0cbd268877912c6f2a4633ad1c34c357d6370 Author: Colin Percival AuthorDate: 2025-10-03 01:06:44 +0000 Commit: Colin Percival CommitDate: 2025-10-03 16:50:29 +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 (cherry picked from commit 86221f965c06efa1cd5b2da640ae23edded7c8b9) --- 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