From nobody Sat Oct 11 00:05:38 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 4ck3m26G53z6CD91; Sat, 11 Oct 2025 00:05:38 +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 4ck3m25P8fz3XVj; Sat, 11 Oct 2025 00:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760141138; 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=Qvzl9M3QaNfMf805d8+3hsPbs/fXFFokeJIvKYsGuFk=; b=o8uhUsunXFAWGJXp+HgN0f6t+w6Bc0ldtKsBGQtRvj5V/kl7a2UQLuceOefm0GLoQdEcga rLOLR1cwHho2e2je5TZrYJf69F70PUZmJja3yz1+1l/7b7k/QuyHE3vX9vr8cq9FoXhBig ZIpi4ICOPig0woP4Za579eaurQQQRPDKwX38qE76sZnT1/XiHf4THyY5w27VcN8QlDsHXl rDkQMsBjVNT6dn4Frwm/iyGxjZA1Pqj1csk+0wq2NSMWZn31W7IDfHGNTBHV2K67xPWZLv LUJFh7bwsKNQ8mlK4ndAlBUN7oaBWk6Em/N/+GtqcZJ/XMeeS6iIr3+ftkWuQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760141138; 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=Qvzl9M3QaNfMf805d8+3hsPbs/fXFFokeJIvKYsGuFk=; b=mzveFIiUfWR046vl8hmPCVr+4OOXwHpP9EIYpCmRbrKXIuSPJ+f0Xi+CSmm7/PNDivqDwo iQgT7dZg4wnS8jIimVeVYprSIlv8Na2D3hTFLXxXlFMItjPMg8w5Xk5bw7Ug/3k8IE+RKW 5j2J6RtyN7khla7jg0qLNy1KO+aCqNTpZW6JjqglzfxccHhou0eZhPDPy8BBRW48VUdpJt XDIPkJ6LOCIMtnIu/Jn9jyvPbBfswgP+8nltU5toDgvmhtlidU2uy+ZXdunrOtTyYN5Vra fTlDCLGFpb+8p4deCRohNtMDB9/N+LDNhjqiY+3SwWppOywwZ+5oI1mXy/cSZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760141138; a=rsa-sha256; cv=none; b=orhBLEz/FG+FGxWOekzXhwthMABZVQPT01vm+q8P+xzA5dGv0jxsSPiMbX4aGlE9ud7pIh GvNttgkB1pd2ZFJc5D5CLCEIqUpPQ7X/oyQFaSGS/BbEgK66MJnrDSg92rg3Hp85zygrHp jIZNY+WfbK/ZUM/zIt9S0PfEolyldeG678i7R1Z7SObLSNFoM1mFv27MVHpCFHChaIPj51 KqATKFEM1GnNwLj/xWB9PWY9bn+W6tuI526HztDMX/iF/ymzf49e2xg7dUn5KBf8EOILH3 otmslJlD3VEJpFEF62cYtY9NXVnYC18lLgfohP25ixm625OSvwKomEQYbRfgEw== 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 4ck3m24wWzz1NjK; Sat, 11 Oct 2025 00:05:38 +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 59B05cUB083456; Sat, 11 Oct 2025 00:05:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59B05cGI083453; Sat, 11 Oct 2025 00:05:38 GMT (envelope-from git) Date: Sat, 11 Oct 2025 00:05:38 GMT Message-Id: <202510110005.59B05cGI083453@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: 7849d8d2390d - releng/15.0 - 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7849d8d2390d8233fd6b60c339d7752531ae5e5f Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7849d8d2390d8233fd6b60c339d7752531ae5e5f commit 7849d8d2390d8233fd6b60c339d7752531ae5e5f Author: Colin Percival AuthorDate: 2025-10-10 22:08:32 +0000 Commit: Colin Percival CommitDate: 2025-10-11 00:05:24 +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. Approved by: re (cperciva) 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) (cherry picked from commit 63da8d263990efc2b27cd43dd0865125abece969) --- 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 }