From nobody Sat Oct 11 17:40:05 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 4ckW8k01S5z6CCnR; Sat, 11 Oct 2025 17:40:05 +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 4ckW8j6H6Jz3Ttd; Sat, 11 Oct 2025 17:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760204405; 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=MC9uwpF3+Qiqpq6HFC4dt2ZhW4+/W4DM1Ro6HP1lWTc=; b=a9FoX4dAD69/ORUAbr0j7K+AoWeq5zA8ebEvgRKhBKkiy1kEHTDVujxYRvUcEj2obsY38z RpzprdIgp2leUAG3ocB7gb8qLabIOGVucJJ1ReiA+lTC/XFcurge2KfhSoonV88yULYckx ts93SJI51fXn362+Vd7lojKZ6AEsO+H/cE/DNDnAmkio9eg3NYpJj9Hnc9G9jNLh1GmUdA caJ5fwx4EqcWOyx2AFAKIKJn87h2879H2ecdhzW2XIGySWVhcM9oe7XuncMWJkq/mOENGx 1oAJbKm3yY+T0Jy5q0Es85ncvsvIfVM+RGFydCpsxB9cj3ZCqVPcV+5ScfuAGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760204405; 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=MC9uwpF3+Qiqpq6HFC4dt2ZhW4+/W4DM1Ro6HP1lWTc=; b=M28bnj4wuM+ejdkL6N4bc9Th6VTx4UMawbmYIIt5hpvE24LgxWM+yXeSiRL3+nE4QeA05I 3p1jbz6S/HjKQyWAqhX8G3268kWxpnF9T4pVnnh5obMM9RcLy92cbFjvZidWeDo03jyc6E 9YurKJc4Bj+3+xgK2r8yZwjnMzkLzkQcnpMUyQ1Vwy6qBgEdZ5egAkV2pO8fnTwoMaPrST FRlFOPX+2h7chs/vop/XAAkkvpontLIZzcC0eHE0nXFnyHvcuE47SmrCJQ5Hz8Nka+D1nT bfacv2EK1eXUP8/ImGJBKybioFYQ7t61Ll8O5tBAOUi8zZzcJDt98lOgUJ0MIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760204405; a=rsa-sha256; cv=none; b=itMyjPg6Y5K3+cqTLJZQli/ad92+sVMFGIAsWnQwcqvhJEVM5g9GbN+mAlreZz7xIWh0gU Zk1yrIIsExKuG+9dRfCLDvMIgEF/Dqpw8tBj6Cf16yR4egOTcdx6krPo5IdKHAeIh4BlbT +XxRcjfiEijsB0kUe5lhgCZfzBS4gAmKaE5tpwKxGBplDqBRwE7ys3pAZ9bcjIh2Jc1+Xx HmP3IMlEftfWxApRH9iomZJy6UHxsJ19t+Igw7HoX9BAU+YVTDbmgLxKd1+b1oFuJ/Md7z NqINGc3Iw1OTGwHwl/ezAhRjqCcBLwS6GF1ThdT3GqonnZzW15U/j74hLkG5tg== 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 4ckW8j5b91zktx; Sat, 11 Oct 2025 17:40:05 +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 59BHe5HL064046; Sat, 11 Oct 2025 17:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59BHe5tR064042; Sat, 11 Oct 2025 17:40:05 GMT (envelope-from git) Date: Sat, 11 Oct 2025 17:40:05 GMT Message-Id: <202510111740.59BHe5tR064042@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: 8a7ac88aa399 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8a7ac88aa3991e8c2c19007ac0c36a92fc94bc2d Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8a7ac88aa3991e8c2c19007ac0c36a92fc94bc2d commit 8a7ac88aa3991e8c2c19007ac0c36a92fc94bc2d Author: Colin Percival AuthorDate: 2025-10-11 17:35:51 +0000 Commit: Colin Percival CommitDate: 2025-10-11 17:38: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. Fixes: 2b0ffc0ee48c ("EC2: metalog_add missing files from packages") MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva --- 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 }