git: 2b0ffc0ee48c - main - EC2: metalog_add missing files from packages

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=2b0ffc0ee48cf6c70506dc479e0fd2166f9de1ab

commit 2b0ffc0ee48cf6c70506dc479e0fd2166f9de1ab
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-10-10 22:08:32 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
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
 }