From nobody Sat Oct 11 00:04:21 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 4ck3kY2vGTz6CDBY; Sat, 11 Oct 2025 00:04:21 +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 4ck3kY2KXqz3WxT; Sat, 11 Oct 2025 00:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760141061; 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=7b/N0RNP65iN2vHPYQAWyyLRlbroJNZa5x6q4KeAB7g=; b=R9h8T0hnInIqyp+i9/0qJTDzwMFl3Ar7CH/Em82Z1OLBuam1x+nzz4NVl4wjJmagf/+aSh eiVgddAHStoIW5lt3S0EXUff8a3C9vwnTTWlFnCHjHZUf+EI7slNxkABRvum3ZRG+CpcDw h6zAnKUSYVSEYnLgw3T5VyAQHORZFo6MFI9bKLbwemiK+XT3N0eGxthHbHtB7KOIUsh73c atJXdnMvJPM8bcnCbcekRJVCpqQUHU1da/g5KfVVzkcbCDAKkgYwOA4vC/RVf1rmpd/EpC mK+aOxAIvHpudBv91eHdIBt9rqGYfEtrEaw3dFtvki4VegFhpCUy3oiAhn5Smw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760141061; 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=7b/N0RNP65iN2vHPYQAWyyLRlbroJNZa5x6q4KeAB7g=; b=UDAUAwKk6sF0w9QWeavDvEjJ2vQL5xlcfw6GowjDiEOuua41uhW1P/64h/Q0vDxnp/u/73 3naIlyCKMqcg0/rn/Z7n/X3vUIyFL0wG50waI3Whjaguzr4TWOg6KyCViKaltJ21+B3IBx N5bwRpf41jQWMjWfC753LBUaklqEuAt57r6OnZL55v+ZrY5A6denTrhgmZ8MXt6ALQtI7t qKfY+DFc+Cep29NFJ8aS19obz5UYimrYMKLY8ZNxj2QnQErfGGk+X1UN8l7tMhgX+djYJY j0/CwyEdySTjrI3Ocw5/DZmuasBrN0amFQzgJtVhs2xMWSIDzbvjb7l2WWSBCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760141061; a=rsa-sha256; cv=none; b=x2ShPRP9PWuaCGFjxe/PoQIkyPw5ma2ZiyT6rYXHvADz8EFjt/br3m35NbOHsFHZLC3fDd cektftdkrXAbSNlrzo6/PB49JhJoACC+pc6TRyrwhuDg+b12axhp+A8N0439z5oRTv9Xuv 7PDyYyY3wmjhRbdcpWvugUezga76U4CY/r5M3vRWxqa+rjsT3rR/RALDbwgl+l9POdm6sb 27GnG7j6dIh4tLJqiJ+6MRKw4uXU1yDa+0GZNgSrSZKuAa+jKjCga31SBrXbXwaMUpONdU Axj3iX4XSHcOdhgptXgegbTTNd2aWCFLZn0dI1UlhjnknF1ok6FrzlR6QXceWg== 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 4ck3kY1s2Zz1P6d; Sat, 11 Oct 2025 00:04:21 +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 59B04L8C082846; Sat, 11 Oct 2025 00:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59B04LZA082843; Sat, 11 Oct 2025 00:04:21 GMT (envelope-from git) Date: Sat, 11 Oct 2025 00:04:21 GMT Message-Id: <202510110004.59B04LZA082843@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: 63da8d263990 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 63da8d263990efc2b27cd43dd0865125abece969 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=63da8d263990efc2b27cd43dd0865125abece969 commit 63da8d263990efc2b27cd43dd0865125abece969 Author: Colin Percival AuthorDate: 2025-10-10 22:08:32 +0000 Commit: Colin Percival CommitDate: 2025-10-11 00:03:48 +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 (cherry picked from commit 2b0ffc0ee48cf6c70506dc479e0fd2166f9de1ab) --- 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 }