diff --git a/release/Makefile.vm b/release/Makefile.vm --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -27,7 +27,7 @@ EC2 \ EQUINIX \ GCE \ - OCI \ + ORACLE \ VAGRANT AZURE_FORMAT= vhdf AZURE_FSLIST?= ufs zfs @@ -50,9 +50,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= raw +ORACLE_FSLIST= ufs zfs +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,7 +113,7 @@ ## If WITH_CLOUDWARE is set to a non-empty value, this is a list of providers ## to create disk images. -#CLOUDWARE="EC2 EQUINIX GCE OCI VAGRANT-VIRTUALBOX VAGRANT-VMWARE" +#CLOUDWARE="EC2 EQUINIX GCE ORACLE VAGRANT-VIRTUALBOX VAGRANT-VMWARE" ## Set to a non-empty value to build mfsBSD images as part of the release build. #WITH_MFSBSD= 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 @@ -27,7 +27,7 @@ " # Should be enough for base image, image can be resized in needed -export VMSIZE=6g +export VMSIZE=8g # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="