From nobody Tue Nov 18 02:18:38 2025 X-Original-To: dev-commits-src-main@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 4d9Svz0LPkz6HQ7V; Tue, 18 Nov 2025 02:18:39 +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 4d9Svy6BxNz3PZb; Tue, 18 Nov 2025 02:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432318; 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=zbdvLjF1LweTgis4vjp9M64EfywIeEDzmJpYAQ0PL6g=; b=QBhRiC62eD8wToa6DROGrsblbPYlfcFi/guJIvrpiEQI67ljTYLDzJpwWOV5F2ucSk7Ujz 3Wb7pPSoTDstBvvZg1rpxrpmbvfy0IX7OyuBBtGeiGYDHYLPrK/JBl21hDTWTXa9YMXQmZ u5jBNOLgrMEgrsNVa+jEljDBwR6cqVmd96wOWgkuUholTfAR9rPIr985jynMojLqRp8EVX mc1OeAlz47JMLr2fp+M76djfvs9d6vOexMkuNmIEb4KZBnmLlLF3kYr8jYQZPA8Wk4xJWV LCnq4Ot4qXZpnwXLPSod1+kl4wlx3b/Qn1HlKToFa3O69K9ZYWPbq65XhdM0TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432318; 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=zbdvLjF1LweTgis4vjp9M64EfywIeEDzmJpYAQ0PL6g=; b=NMX8gHySop1g7FpVZsa7hf3ZuU3RlEnYGB/lwLBC1r9Ol9epfPBypE6Nbi+0R/4p6i739F RJgfYvWmixbxRkX/4CBXAGS6xroO1YJfbOxEhdt1yE74eBj2K2aR5zyNlYIKmL8s19+zln nvQ2WqLKxOKuqTO3QzgpuJxUwmnXRryfjkSCLQUx4wREcwdeVSk2mPU5Z4CGtH4N0GwxxW Gc38p9zbPnhQenpvXfAOtkxVApDR6eBNm16AWCjkeX1w/LrDVQTTNVBilq48eILP31anG8 mL9JxkyLVEzDKKNhgQhyExlIUTN9PIqrD7QnYa0T0OFgfE7J+a9wbBSYhNXrNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432318; a=rsa-sha256; cv=none; b=R9AYzUFzfvQjCBrV2dGRLzg5MEK6qHBxefqcmp9+EMpyVdzjOSsW5xjGEzDWvf71IJ22mm Hqy3mBPX8+6P4LQcfHKfJ7x9sHUa3v3YJtHGc/hca2jFtCAS5WZIOPZGwXKSoXb0TzrdQO 9SAuBXWKpbg3uCrk9RdedbpUqxCWVCsy/1hEbFFpXiPoHT54y5/lT+JlHiRbTjzkos5Snq Xba+7Zm8h90FzxjfJFJbjyYcHZFL1Wp4eXCujQIXrDhN4WnHnrY/tJFQ5XB+/MylnlWAnM 2lq7Kv9kMDCvmPdZbm+nf1a7KqnOcIOOifVTO4M99AAMyvh8Ywd3UTWdM5uJ6A== 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 4d9Svy1vDgzbmT; Tue, 18 Nov 2025 02:18: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 5AI2Icep003187; Tue, 18 Nov 2025 02:18:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2Ic2i003184; Tue, 18 Nov 2025 02:18:38 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:18:38 GMT Message-Id: <202511180218.5AI2Ic2i003184@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: f6e9474ebdd5 - main - release: Add a MISSING_METALOGS hack to VMs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f6e9474ebdd53de5cf487c7bc9e0fa6743881c23 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f6e9474ebdd53de5cf487c7bc9e0fa6743881c23 commit f6e9474ebdd53de5cf487c7bc9e0fa6743881c23 Author: Colin Percival AuthorDate: 2025-11-18 01:04:55 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:18:27 +0000 release: Add a MISSING_METALOGS hack to VMs The packages for 15.0-RELEASE built without the bug fix needed to make files created via @sample get properly listed in METALOG. Fix the cloudware which contain @sample-using packages by adding the necessary files to METALOG manually. This should be reverted after the next full package build, and live on only in releng/15.0. Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53797 --- release/tools/azure.conf | 10 ++++++++++ release/tools/ec2-cloud-init.conf | 12 ++++++++++++ release/tools/gce.conf | 10 ++++++++++ release/tools/oracle.conf | 13 +++++++++++++ release/tools/vmimage.subr | 10 ++++++++++ 5 files changed, 55 insertions(+) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7975e1db0822..981e40566a1c 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -18,6 +18,16 @@ export NOSWAP=YES # https://learn.microsoft.com/en-us/partner-center/marketplace/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space export VM_BOOTPARTSOFFSET=1M +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/waagent.conf +" + vm_extra_pre_umount() { # Remove the pkg package and repo databases as they will likely # be out of date by the time the image is used. In unprivileged diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf index 2a15ae5c57d8..8ad86a082260 100644 --- a/release/tools/ec2-cloud-init.conf +++ b/release/tools/ec2-cloud-init.conf @@ -9,6 +9,18 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent net/cloud-init" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/cloud/cloud.cfg +./usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg +./usr/local/etc/cloud/cloud.cfg.d/99_freebsd.cfg +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { # Configuration common to all EC2 AMIs ec2_common diff --git a/release/tools/gce.conf b/release/tools/gce.conf index c1e129ba69d6..558641821b16 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -17,6 +17,16 @@ export VM_RC_LIST="ntpd sshd growfs \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/instance_configs.cfg.distro +./usr/local/etc/pam.d/sudo +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/syslog.d/90-google.conf +" + vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf index ebda3b3d6e61..152c48af1829 100644 --- a/release/tools/oracle.conf +++ b/release/tools/oracle.conf @@ -39,6 +39,19 @@ export VM_RC_LIST=" sshd zfs" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/cloud/cloud.cfg +./usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg +./usr/local/etc/cloud/cloud.cfg.d/99_freebsd.cfg +./usr/local/etc/pam.d/sudo +./usr/local/etc/rsync/rsyncd.conf +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { cat <<-'EOF' >> ${DESTDIR}/etc/rc.conf dumpdev=AUTO diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index d718150d8767..0ca9ba267ce0 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -334,6 +334,16 @@ buildfs() { metalog_add_data ./var/db/services.db fi + if [ -n "${MISSING_METALOGS}" ]; then + # Hack to allow VM configurations to add files which + # weren't being added to METALOG appropriately. This + # is mainly a workaround for the @sample bug and it + # should go away before FreeBSD 15.1 ships. + for P in ${MISSING_METALOGS}; do + metalog_add_data ${P} + done + fi + # Sort METALOG file; makefs produces directories with 000 permissions # if their contents are seen before the directories themselves. env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted