From nobody Tue Oct 14 02:54:13 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 4clzM93Bb7z6Cp4N; Tue, 14 Oct 2025 02:54:13 +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 4clzM92bnwz3FDY; Tue, 14 Oct 2025 02:54:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760410453; 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=7mq4e/xCUM1pu8TYX+ABqblyPJpY1Wfcw9XrvwR2FjY=; b=aAOkL0sLVG97uYD5t7jlNBVuGpebz/5MoChRKw5dshQzWJ+l1AKMsUDqVtoi+QS0MWZ6Ru oClGM4ZTAEYuouaG36alS2v2lgeNSbEUQS6u6HTed6nYTvKD2/vMKw9M35VpZsIYlQZhHZ qUMfK0vWPF6osKy74h8i02Qh0FPuI/sd8tnfHqttKzJg/ZTcAs28yBaYEiYS/eIQkUysS5 Ay9oodqYl0a31R9TRSOwUD/I4QXwCri8Qta3o2yr+LAudBzwsBxeTNSIS7cOsSIdW4IZwB hdt6tSo5+OIK80gVl76Tdtz1IvwLKADxFqBXWmsDPvYXZVJr9hSOdXL7X/FeqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760410453; 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=7mq4e/xCUM1pu8TYX+ABqblyPJpY1Wfcw9XrvwR2FjY=; b=Jw0vOUoVW/qmEYFYgM195KZDeVLR1/Ip5wJ+n0weSntSkm11BhsKnRZ7k8lS4Ndbs2vCQo fcQoyAXKzJ86U2D0KVgEMWZNR9oyVdw37CEmgzJnAzMX0XAp26Fwr/GFEZDleu/LScu2XL /BBK0iY+xdKSvcTX+pYCfQxlQ6hbYTs/92u/8jH6DdfhUq5qRnF/xaHcB9t06b+eWdA5zi TjU3mY9amFJadkWYPUZ8jLTYNxOmN64Q1bGpp+0scGXn7HxtEr+s/QR1zvbIipKM2e1ME1 gcYRIWDL+ejSeziWKaqeVcYZx7E8thGhd0O082IQRePavJrC1079CmL0N36jOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760410453; a=rsa-sha256; cv=none; b=FJLsGxr7BKiFWM/BbJE8xKbG15a2VUc7yg7ntgYJTG7noImDJZZADWdv3JpMEr0+SjDKMA 8jsXRfst6zANn8r8r/ZcIQnHjmQycRYjWU8AB3fuxAFKXRJSVqI7GKPUy/10JQIoq3/II9 RDJ84NmPxjNJuc953NOFl5sy0IhPCyE6LawnGt02eQ9nZwiXpKUEIFvAhg59OesLVvEDA4 8vqL4++IcUwP5akAihsKdjMl+afzEqxXD6jWbB4PNS4pCyrzhUJ9khvby64z0qFrMJ+eDT Mt5GXkCOKaJMCdV3/JIpOm9YTfjar42EZQld5x6J2uU4hgtQw8c/XnmMkcpr4g== 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 4clzM929jrzbNQ; Tue, 14 Oct 2025 02:54:13 +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 59E2sDmS046918; Tue, 14 Oct 2025 02:54:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59E2sD15046915; Tue, 14 Oct 2025 02:54:13 GMT (envelope-from git) Date: Tue, 14 Oct 2025 02:54:13 GMT Message-Id: <202510140254.59E2sD15046915@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: e9010214e9be - stable/15 - EC2: Fix additional files on small+builder AMIs 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: e9010214e9bebbe6155c9f720551008a785b692c Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e9010214e9bebbe6155c9f720551008a785b692c commit e9010214e9bebbe6155c9f720551008a785b692c Author: Colin Percival AuthorDate: 2025-10-11 17:35:51 +0000 Commit: Colin Percival CommitDate: 2025-10-14 02:54:01 +0000 EC2: Fix additional files on small+builder AMIs The file /usr/local/etc/ssl/cert.pem is not present on "small" and "builder" AMIs, so we don't need to add it to METALOG. Fixes: 2b0ffc0ee48c ("EC2: metalog_add missing files from packages") MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 8a7ac88aa3991e8c2c19007ac0c36a92fc94bc2d) --- release/tools/ec2-builder.conf | 1 - release/tools/ec2-small.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/release/tools/ec2-builder.conf b/release/tools/ec2-builder.conf index bcea69331be5..3b0344f9eb9a 100644 --- a/release/tools/ec2-builder.conf +++ b/release/tools/ec2-builder.conf @@ -68,7 +68,6 @@ vm_extra_pre_umount() { # Add files from packages which weren't recorded in metalog metalog_add_data ./usr/local/etc/dhclient.conf - metalog_add_data ./usr/local/etc/ssl/cert.pem return 0 } diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index f12afec75a4f..6564a59c2cf6 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -51,7 +51,6 @@ vm_extra_pre_umount() { # Add files from packages which weren't recorded in metalog metalog_add_data ./usr/local/etc/dhclient.conf - metalog_add_data ./usr/local/etc/ssl/cert.pem return 0 }