The branch main has been updated by dch:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1be84d745bcc11b766ac1fa03afd2c8ea8771737
commit 1be84d745bcc11b766ac1fa03afd2c8ea8771737
Author: Dave Cottlehuber <d...@freebsd.org>
AuthorDate: 2024-10-15 09:28:12 +0000
Commit: Dave Cottlehuber <d...@freebsd.org>
CommitDate: 2024-10-15 09:28:12 +0000
release: move OCI to ORACLE
This allows future releng tooling to use OCI for the industry
standard Open Container Initiative tooling, reducing potential
for confusion.
Approved by: cperciva
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D46975
MFC after: 3 days
Sponsored by: SkunkWerks, GmbH
---
release/Makefile.vm | 8 ++++----
release/release.conf.sample | 2 +-
release/tools/{oci.conf => oracle.conf} | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/release/Makefile.vm b/release/Makefile.vm
index b4fe6e23ffcd..a78a5f33a285 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -26,7 +26,7 @@ CLOUDWARE_TYPES?= AZURE \
BASIC-CLOUDINIT \
EC2 \
GCE \
- OCI \
+ ORACLE \
VAGRANT
AZURE_FORMAT= vhdf
AZURE_FSLIST?= ufs zfs
@@ -46,9 +46,9 @@ EC2-SMALL_DESC= Amazon EC2 small image
GCE_FORMAT= raw
GCE_FSLIST?= ufs zfs
GCE_DESC= Google Compute Engine image
-OCI_FORMAT= qcow2
-OCI_FSLIST?= ufs
-OCI_DESC= Oracle Cloud Infrastructure image
+ORACLE_FORMAT= qcow2
+ORACLE_FSLIST?= ufs
+ORACLE_DESC= Oracle Cloud Infrastructure image
OPENSTACK_FORMAT=qcow2
OPENSTACK_FSLIST?= ufs
OPENSTACK_DESC= OpenStack platform image
diff --git a/release/release.conf.sample b/release/release.conf.sample
index 40f8457e8f89..c306efb13b65 100644
--- a/release/release.conf.sample
+++ b/release/release.conf.sample
@@ -113,4 +113,4 @@ PORTBRANCH="main"
## If WITH_CLOUDWARE is set to a non-empty value, this is a list of providers
## to create disk images.
-#CLOUDWARE="EC2 GCE OCI VAGRANT-VIRTUALBOX VAGRANT-VMWARE"
+#CLOUDWARE="EC2 GCE ORACLE VAGRANT-VIRTUALBOX VAGRANT-VMWARE"
diff --git a/release/tools/oci.conf b/release/tools/oracle.conf
similarity index 94%
rename from release/tools/oci.conf
rename to release/tools/oracle.conf
index a4fe54ad3031..d3b4eb351107 100644
--- a/release/tools/oci.conf
+++ b/release/tools/oracle.conf
@@ -68,15 +68,15 @@ EOF
# S14 Root user login must be disabled on serial-over-ssh console
pw -R ${DESTDIR} usermod root -w no
- # OCI requirements override the default FreeBSD cloud-init settings
- cat <<-'EOF' >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg
+ # Oracle requirements override the default FreeBSD cloud-init settings
+ cat <<-'EOF' >>
${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oracle.cfg
disable_root: true
system_info:
distro: freebsd
default_user:
name: freebsd
lock_passwd: True
- gecos: "OCI Default User"
+ gecos: "Oracle Cloud Default User"
groups: [wheel]
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
shell: /bin/sh
