From nobody Wed Nov 05 22:03:27 2025 X-Original-To: dev-commits-src-branches@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 4d1zq33wXCz6DvgM; Wed, 05 Nov 2025 22:03:27 +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 4d1zq32J2wz3KrK; Wed, 05 Nov 2025 22:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380207; 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=8o7fJ/FiNnBXMd73v48NHLWqZJung2MEFPptteaabIs=; b=T2qvfiWr1yUas+5JtI4Y2cGwjiRRH6N88G41iP1ZbyCBPka7lMkvawZMUK2khB6R+cN2HG VkCrJhoNE9sPlrbYntMrq6wFeRDFkOC/Yk7dNu/Ltw7GlSYLJWgE6GRxk4CEdjGpnzvqeN m9zgYqW++q7S0KokGzq1MJvxWDXyagPDmpW/mVPWiCbjWN7Gu6gGtVyV4f+vIIMGEqO1tb GSJHC0ULHB21C3YMhYK+yXNu0bskKSrxF5ewVGA0g8wkem+3t8J1BoeKOHSyoYYER/u+YB u6/B1HV/y41LlLahMBFh78nEGwVF1eJluXXtC3jV5wjHivDsM1EX496aQwPiIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380207; 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=8o7fJ/FiNnBXMd73v48NHLWqZJung2MEFPptteaabIs=; b=ldKfqpS1yQEkHj/xE1HUApAXP5ObvcWlJW0SI7eGDsJx4+349xVnIuvGzSOWZ3+SGM23Qu mbbJxe2t/DdGJdi2zxOYu3RzAfEoI3HPFfwBORGikBAGRYcQI3dUfxq2O+jq6Fc8BS+SgK oPXY0nACXhEXcaHlWnIkrwqTMtAxaUPwFFLAuQQ2go0tgVFwahXdPcwHMtJzEli5qz0sCe R8QodrUM0a8jOuKpWeOe4l+Y1Q/0pRZd+QLEhE6+RLktl7CKTVhyH0n96zbgqzPTiOxrJM QB1aeFyp/eVOnwvLEHG9l/7rU2to9GgjntibjnjC1olzNM5sUiYIMhPeCW/N1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762380207; a=rsa-sha256; cv=none; b=lK57Ggeg658WXjP2L6GdbsX/ApugiFZbkvMruSGMnVd81kTg/UoBG6r6XtqndrpaqdZwIO U01GxMRZWaDI0A7ExIrZtIuvIUyK525ASF+CcTDjMahYAcPsvPRxDtChA/rysbmtCZbhML ujSDLKr1uZOJPnYYBrKKnCZDd8XEFF3Ljz1KL+zW01HobJhBbdoBCfq6XbUHt/7xtYzdiZ /Vai+Bn0bQQM06xD3oRbkAUmWFZGLnusxWxVsqIXqGnl+fODFej+Ru9XboG/b6veB6RFpq j9e5qnO/qUER6POuF58ZX/7LhHFXuZ1C1ExJ/CySE+Wc3RaN0CeNFznu9cT7Xg== 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 4d1zq31vmrz12GQ; Wed, 05 Nov 2025 22:03:27 +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 5A5M3RcW068388; Wed, 5 Nov 2025 22:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5M3R76068385; Wed, 5 Nov 2025 22:03:27 GMT (envelope-from git) Date: Wed, 5 Nov 2025 22:03:27 GMT Message-Id: <202511052203.5A5M3R76068385@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: 40e50d6d198e - stable/15 - release: Spell metalog_add_data conventionally List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 40e50d6d198e9821e7e14ef11a3eb9e55721cd84 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=40e50d6d198e9821e7e14ef11a3eb9e55721cd84 commit 40e50d6d198e9821e7e14ef11a3eb9e55721cd84 Author: Colin Percival AuthorDate: 2025-11-02 00:16:35 +0000 Commit: Colin Percival CommitDate: 2025-11-05 22:03:21 +0000 release: Spell metalog_add_data conventionally Reviewed by: markj MFC after: 3 days Fixes: f1995d6fc13f ("release: Prepare GCE cloudware images for building as non-root") Differential Revision: https://reviews.freebsd.org/D53530 (cherry picked from commit c3a3af1346684eedf836fb62f874092ce602697e) --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index a7ccfc27a75c..b0a65c2981e1 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -21,7 +21,7 @@ vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf echo 'nameserver 8.8.8.8' >> ${DESTDIR}/etc/resolv.conf - metalog_add ./etc/resolv.conf + metalog_add_data ./etc/resolv.conf } vm_extra_pre_umount() {