Page MenuHomeFreeBSD
Files F107443857

D46975.diff
No OneTemporary
Actions

D46975.diff
View Options

diff --git a/release/Makefile.vm b/release/Makefile.vm
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -26,7 +26,7 @@
BASIC-CLOUDINIT \
EC2 \
GCE \
- OCI \
+ ORACLE \
VAGRANT
AZURE_FORMAT= vhdf
AZURE_FSLIST?= ufs zfs
@@ -46,9 +46,9 @@
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
--- a/release/release.conf.sample
+++ b/release/release.conf.sample
@@ -113,4 +113,4 @@
## 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
rename from release/tools/oci.conf
rename to release/tools/oracle.conf
--- a/release/tools/oci.conf
+++ b/release/tools/oracle.conf
@@ -68,15 +68,15 @@
# 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

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 15, 6:01 AM (7 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15806628
Default Alt Text
D46975.diff (1 KB)

Event Timeline