From nobody Sat Oct 11 00:03:24 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 4ck3jS5Qfpz6CD7c; Sat, 11 Oct 2025 00:03:24 +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 4ck3jS2qtNz3W0g; Sat, 11 Oct 2025 00:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760141004; 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=HpmLZtu2a5ZsZ4TcRrqEjS/eqmEx+DOBJvlqqNL0y4M=; b=VdVUsKEWtnlao9Hsfve3oAVSZ69v2bnsUokwIabvJsgjQ88Cr6WcFtIphZbhEWtCWAQJNd yHXB7LXOkX2g+aq2jNJn0HEvNWbOkDW7m1rrM3OFC6yXyLcaxwRzkXmEmOrK2xq8YHU5TJ 22u/65EpXT0QdyfKGs1t5c3qnSFnCGdxYqHosuuqeOXAVEX3X0qAJsqGZMjIgq9JuDmDPe vy+S/j0gS9V4ETke5QCFLEy1jhFmSZ+ofX/j8gJGhx4CwX8CGM0uVPz1t2ttpIg29vg3gu OdyC26O0o/4PclMccRUpLuxnJb8Eco6yUk5tIrG4VIrUqvEDLsbksWcn169ZHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760141004; 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=HpmLZtu2a5ZsZ4TcRrqEjS/eqmEx+DOBJvlqqNL0y4M=; b=ba72lfjrv+k6l7mjpk7mi+JubfKsvn/5qGL3YLre71rRQGZm1DXxpyW0/U/vTL41k9DyT+ Oz+Nvu2fMHaBi+mIuj3pM0dcAfA3YimODKRFvlWBtIC5ovCfHcxQsEpuuj/0BAfrIPd5/O ny9vHkWLK24aETTzHmR32OFJ5ETNMZVb9YWs7H2PIG/a0gNEEx9gIDt506A9xFgwe8WOJW MU1NFUdjZhaWl58MZX7oTIMvFD0e7Cr9Z6V6S/ABmuqV+5hDvQTHs/BCFTwT7AvF7SWZIn /KWltF727l9kMVbrC2XZIRBbz56HZz/F+nSdhSo35vIyd4SUghAp0UbjH4Ucaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760141004; a=rsa-sha256; cv=none; b=Ar1J86++pOIB2m6DhshR3rdXyi2t7uaZUI6gLebRYOmL1mO0k/c8Og9RWGAEgaYGwHOnks saVBiAD9JplR2HK9dQ82D5X8Kn2J3fwa/gTEt9By6IwoSzFl9CEykoXh99uQ1BmfStxtEK GUVodt/0ay1Hej7aH19T0XAMcYgLwxRIG7Vs3JS5af11aIN7vt+UWK5Yfec3ChjBDoljH1 OuZAr+r6CFUyMPDNumwSMh5/dvCGGNxGq0loxDGOx0PUKApWr57EOt8Mfj/cmI5R/K1Rqr d8V46VPmX8Z3o7RcTyur9t4DFEhDpQYObwJlmo+Yj82uopUXemUnsBlANrh5lQ== 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 4ck3jS2QMJz1NsZ; Sat, 11 Oct 2025 00:03:24 +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 59B03OwQ082415; Sat, 11 Oct 2025 00:03:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59B03Orf082412; Sat, 11 Oct 2025 00:03:24 GMT (envelope-from git) Date: Sat, 11 Oct 2025 00:03:24 GMT Message-Id: <202510110003.59B03Orf082412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2b0ffc0ee48c - main - EC2: metalog_add missing files from packages 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/main X-Git-Reftype: branch X-Git-Commit: 2b0ffc0ee48cf6c70506dc479e0fd2166f9de1ab Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2b0ffc0ee48cf6c70506dc479e0fd2166f9de1ab commit 2b0ffc0ee48cf6c70506dc479e0fd2166f9de1ab Author: Colin Percival AuthorDate: 2025-10-10 22:08:32 +0000 Commit: Colin Percival CommitDate: 2025-10-11 00:03:07 +0000 EC2: metalog_add missing files from packages The files /usr/local/etc/dhclient.conf /usr/local/etc/ssl/cert.pem are created in EC2 images by installed packages, but are not being registered in METALOG. The reason for this is not immediately clear, but may be related to the handling of "sample" files. Reviewed by: dch MFC after: 5 minutes Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53035 --- release/tools/ec2-base.conf | 4 ++++ release/tools/ec2-builder.conf | 4 ++++ release/tools/ec2-small.conf | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index b6354db3d9d1..ffe2646240a5 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -36,5 +36,9 @@ vm_extra_pre_umount() { # Standard FreeBSD network configuration ec2_base_networking + # 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-builder.conf b/release/tools/ec2-builder.conf index a55485fec0cd..bcea69331be5 100644 --- a/release/tools/ec2-builder.conf +++ b/release/tools/ec2-builder.conf @@ -66,5 +66,9 @@ vm_extra_pre_umount() { EOF metalog_add_data ./boot/loader.conf + # 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 acaffbbc0c42..f12afec75a4f 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -49,5 +49,9 @@ vm_extra_pre_umount() { # Standard FreeBSD network configuration ec2_base_networking + # 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 }