From nobody Tue Oct 14 02:55:18 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 4clzNQ27yjz6Cp8F; Tue, 14 Oct 2025 02:55:18 +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 4clzNQ1Rkcz3FSh; Tue, 14 Oct 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760410518; 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=TpneU0DiTnKrGdTtRHK7/OyEMcdn0h/XshPsxncBmRE=; b=alKmCGgoeQDyfSnBbYphYCZyfWPKrfD7u4GDPJFwKieatOSM/COh15QolL3JF2UBUrppyZ ofaOg9DsuBfUxQB/s28qdBEY8rbTKZSCeZqnpA45Qpv9rUhxEYhXl5rBM0rEvLM7a5W9zp pDmQGlfgYZrO0IBhUKEYDSI+n7raSeOHXu7PSuipXzwVgldrXZShS1mamn13Mh8cnMf/yC cPPyyD2rFMwtAee26o4iJ9EQBNgmc9AYDoXnaMnvHmGHFWEJkhSLu8dG8CFtobP+BwOmTR A/zR5e51PuId1dGVK0RfSg26fRWBJ2QFL/vJFx9cPdZyuEF9oo6/+YDJLc+vmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760410518; 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=TpneU0DiTnKrGdTtRHK7/OyEMcdn0h/XshPsxncBmRE=; b=GyEkpngndYTPNuqaFJdzjbZvr4dvHV5LuYM5zypl/gGvvIhS9ECL77qcJzjwzn1KsqdRFW yPWL+FhUYzbpEs0ZNXPSXyvvpltRs41dT0oafCXh5ExLjLG2NgeXzwqX1eDoNnTFB9CqJ1 8xkRiDiH5UETsayIDaktOR4zmVmaDQFdTh4GSH3OWROS7Ex5G1+DbS4DIcVs8Mr4f5HwkG 6NUTSEBnokqIr40I/CpWSetNYOJTiyET7B7U9hD4o8q/+doMxWOKhT1aaj+UoiemgNTiSd fhkij8tQJnkPAZ1DXSE4KPosKJz3Nkfbss3/LWqjzVQIx6qmwMjqJ2GaRD9z2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760410518; a=rsa-sha256; cv=none; b=R1ZtRucDVnFS/UiYSld0aQqjqjBY9AZH0Ejgb2FuPl7iqSQwByWGVklimuuWO98NA9N4ec /Jnmijrq0nKm/Ft9xTg4eNZ4vFCbHbE5W5PvtGm5rtLenXcV32grmrz8q3lLtd3UxnmMLl 6niip2l4kl3J/o8UV+jw9vtDSQ5fByvcTxal4fDtZc8YqtXr9xfRyXcycEahvC9YD7Az4Y jgriKHDVN5eZutkroUuGRYX3+KnZYzB4RHfCo5torosKlsPPe2nRc9sVQjHYzwN6L/DQCm 1jmdBcrTPpmpYjV0GAJw3JXsdQiBbNJFjcv+Hl7DaMaIlmgoHR/0OotTN52fzg== 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 4clzNQ0z32zb5q; Tue, 14 Oct 2025 02:55:18 +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 59E2tIwi047368; Tue, 14 Oct 2025 02:55:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59E2tIJB047365; Tue, 14 Oct 2025 02:55:18 GMT (envelope-from git) Date: Tue, 14 Oct 2025 02:55:18 GMT Message-Id: <202510140255.59E2tIJB047365@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: 6908a3580702 - releng/15.0 - EC2: Fix additional files on small+builder AMIs 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 6908a3580702a446d8420bb93ed95530a98c936b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6908a3580702a446d8420bb93ed95530a98c936b commit 6908a3580702a446d8420bb93ed95530a98c936b Author: Colin Percival AuthorDate: 2025-10-11 17:35:51 +0000 Commit: Colin Percival CommitDate: 2025-10-14 02:54:24 +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. Approved by: re (cperciva) 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) (cherry picked from commit e9010214e9bebbe6155c9f720551008a785b692c) --- 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 }