git: afe49951b819 - stable/15 - release: Prepare oracle cloudware images for non-root builds

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Tue, 30 Sep 2025 15:23:34 UTC
The branch stable/15 has been updated by markj:

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

commit afe49951b819df76bd6bdddcb373271f6ec4f19c
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-09-16 16:53:56 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-09-30 09:43:07 +0000

    release: Prepare oracle cloudware images for non-root builds
    
    - Add metalog entries.
    - Remove a stray entry in the package list.
    
    Reviewed by:    cperciva, emaste
    MFC after:      3 days
    Sponsored by:   The FreeBSD Foundation
    Sponsored by:   Klara, Inc.
    Differential Revision:  https://reviews.freebsd.org/D52454
    
    (cherry picked from commit 8f5791873a30122f72266cc44309933118d7fe36)
---
 release/tools/oracle.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf
index 72c8dd9ded78..debc5c1352dd 100644
--- a/release/tools/oracle.conf
+++ b/release/tools/oracle.conf
@@ -55,6 +55,7 @@ EOF
 		xz_load="YES"
 		zfs_load="YES"
 EOF
+	metalog_add_data ./boot/loader.conf
 
 	cat <<-'EOF' >> ${DESTDIR}/etc/ssh/sshd_config
 		# S11 Configure the SSH service to prevent password-based login
@@ -82,10 +83,11 @@ EOF
 		   network:
 		      renderers: ['freebsd']
 EOF
+	metalog_add_data ./usr/local/etc/cloud/cloud.cfg.d/98_oracle.cfg
 
 	# Use Oracle Cloud Infrastructure NTP server
 	sed -i '' -E -e 's/^pool.*iburst/server 169.254.169.254 iburst/' \
-        ${DESTDIR}/etc/ntp.conf
+            ${DESTDIR}/etc/ntp.conf
 
 	touch ${DESTDIR}/firstboot