From nobody Fri Oct 3 16:53:50 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 4cdZW26Q2fz6BBh8; Fri, 03 Oct 2025 16:53:50 +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 4cdZW244TZz3HfK; Fri, 03 Oct 2025 16:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510430; 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=uJ9rM3uWdkIdiyuZvDsA0o85P0H4PRUiIIfqCMDr8Rk=; b=q/rFW/NTOv7oIPTZJ9vxgaQINcY4m0ulKUpIQUmZscQxEX6w5vtwDSk5KM5WBI4hHK64YI AHUV6gWnXfzpsSLMzh3aM+Nv7vu6loG0npJ5vPusGcz0RILRExLWb1HKDkiH1x7OLWmtyH jMjgAnQVur6sZAIpCodcfUMTzDgLY6C8ppma7X8sqwu8sxxrVYzA2Idkn2RDpEyDW92RBG LrJ2xR7XILNxurW48fROlMkDcXsSw7Ngc3S66k+ggCeDBrHsDEA6h94PbCgENZx+TqBayt vrQViwj3Nf9Hd/neDH7G96c+nR7fnw2/FBwlX43axA9Y0+daSF4uhBPSBbddKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510430; 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=uJ9rM3uWdkIdiyuZvDsA0o85P0H4PRUiIIfqCMDr8Rk=; b=SZJ9qCtN6fad5D/u2ovU63jmJbXIj1SrnQG7NnRdVjzt8A2W0O4A8zBJSs6j0dVW8r9ZbW VPd15k8AQb68ahKOiWTyykWL9dgRXGhzaLRUHcNo+21IGm4zlbBoE2idDLXfBF9DZT48Z9 JijMAAUVA8LsNoQe9KgLI8uyp3C1F50Lyw3BUCsqqenyq17SZ0I8fgsnsFDiVtvSlgRJBU WXT2rOztOxNNRZzEC8w7qDvVuidmN5C2UNzoNG29K2NMeXi71l9Dvi0k8WheKSM+OgjJ/S 474eez+0r/rPt2G3vdbl89sKUk948mFPNEk7uj8vJb81aApMxmGsyoHefjTXRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759510430; a=rsa-sha256; cv=none; b=iSVgog8fFOTE21O7BOAJTkVVKnFMtiQgYn8s4WLI7AbwldHdrORVDUF9gzOzgVBkPgvF3O AjkgDsu1RGD/oYZbeHV+KwWUk5WH8d3vbRJJodQP0ssNGpe9Q1dTWheOjVZ7lBKeg4z4VW Ji4RY4iLpzMBcb9Z6hwQNsQ5rW/IIVy6Na/6oMu7FRVU6Nc2b63NYnL2GSI6ihCuhUximV gzdWHJwp65dBIHimEpF/FVpu1T8f8TKzezaAkHfm70ezdBtTZrswWC6V+h1Thi7Mzz6v0/ bJa3VaLaWfAbgUSAgHhvXsvlRAYOY8v5yl3zNEKZkSimR6E5GgHQSb2LzuyCQQ== 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 4cdZW23LV6z13P1; Fri, 03 Oct 2025 16:53:50 +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 593GroEV064446; Fri, 3 Oct 2025 16:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593Grojk064443; Fri, 3 Oct 2025 16:53:50 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:53:50 GMT Message-Id: <202510031653.593Grojk064443@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: eb90941ee5ad - stable/15 - vmimage.subr: fix typo in checking NO_ROOT var 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: eb90941ee5ad87cd69c13d089b72920f755c1132 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eb90941ee5ad87cd69c13d089b72920f755c1132 commit eb90941ee5ad87cd69c13d089b72920f755c1132 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Colin Percival CommitDate: 2025-10-03 16:50:41 +0000 vmimage.subr: fix typo in checking NO_ROOT var Reviewed by: imp Fixes: 08b497dc6c4d ("vmimage.subr: Support NO_ROOT pkgbase") Signed-off-by: Siva Mahadevan Pull-request: https://github.com/freebsd/freebsd-src/pull/1867 Sponsored by: The FreeBSD Foundation (cherry picked from commit 65e2ce55b662447fb4e87246262c07bf5a25efe9) --- release/tools/vmimage.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 27cca78be6e3..3b0519c21dbc 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -95,7 +95,7 @@ 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 + if [ -n "${NO_ROOT}" ]; then pkg_cmd="$pkg_cmd -o METALOG=METALOG" fi $pkg_cmd update