From nobody Thu Oct 31 19:19:37 2024 X-Original-To: dev-commits-src-all@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 4XfYhn61Kwz5cDjC; Thu, 31 Oct 2024 19:19:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfYhn5SzYz4Hj9; Thu, 31 Oct 2024 19:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730402377; 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=qSmj3pcSH18sQRVuCmg76F7K/l11f2c6LqsSELh+ljM=; b=FU7yMZY65ybx9dCgQ5l5y3fVt2riAE3fN9OxEVP9xShivDRIBSYkikhjcTBRu21WnzrUiA 3XnDExkJO8dyfgb/uwCXHcE4JsTzKEw7QGPG8RcM/7m7D9iT63Qj6qyudIPwSDivKcrI2P JdnWg8ijIXGNj4tDrx0Oi1IFYAVdJz4mHI68lc+07v/AUlG0t143oRMMZ8A35MluTYyyaw Re2hpG7vw2ZtsPyAEctqhbG9eK4dP5ePQHFQHyBn8e2WH9x1yd7JZ/nxlk3JSrmWb+VSiF vbsMkikFxkzfdyQP/fvYQBjVoraXVyZOJflHU+avzM0cr7O+7waU6GJRR3uxjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730402377; 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=qSmj3pcSH18sQRVuCmg76F7K/l11f2c6LqsSELh+ljM=; b=jwyHeO1Ktvvi64psatJL7rXVWMmgRQVKUG4z9IfpPSAct9jp2kXAnMlUQj/Zu2ZWfS8ic9 avgtjJjZgsJIT1RuJHIKXmx59KHIbPUZY4HRZEnR5jcU29p0il1hVxUnmOSvQeRJsoSlGe gzexlOXPM5Z7ATWQdvsK+LglttfiWa3OR77ipJJdeV+BpxZCPTmvyGPXvADwpaNmkZpKGE L1aUm4lG/pZDJVjnhv6fmqW4/gHZwAKoDiaIUBZyW26f4nuXufzxBi7DvzIBx6JiYFfdAF c7Dc3hQCs/6zxhlP5/knwpAZ0hosZv4frYrbS4v4iFvleKfN/XRboDqX+WkxKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730402377; a=rsa-sha256; cv=none; b=FT3R7CrtCspAh2KL4X1J2zI0ejI1imJFYye0bzweJ9dehFK+qeKQR2c8dRG69/K0kMSBEa tOGleSd0enrchbKYy9S+tbzPl8JzIy6FX7gvHYXkWowVy5kl+5pg2QsBiau+c9Nb/1ZkfU zAWqMVKMff198SHloWP7Fb9w4448Z8nvP3KpIc9Y7dY/EnwBcedtzXU3coLl4n2lAq0CYf EDBC0i6m9hR4uU1dnJR8p6wyvrAVxRRiPhrRt6n8YdKtEPLn/ZgZMTJ3cbe9buUlmISqzd wB1jOCYD7kJNFWQ0+5OUskksh+RV+B7WYgQL/p8N8EMKPZz+jk3ziPReYP93eQ== 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 4XfYhn4yYwzpBD; Thu, 31 Oct 2024 19:19:37 +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 49VJJbmv033833; Thu, 31 Oct 2024 19:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VJJbls033830; Thu, 31 Oct 2024 19:19:37 GMT (envelope-from git) Date: Thu, 31 Oct 2024 19:19:37 GMT Message-Id: <202410311919.49VJJbls033830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: 77b296a2582b - stable/14 - release: move OCI to ORACLE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 77b296a2582b4ea5e4398398e22bd5b4d3323107 Auto-Submitted: auto-generated The branch stable/14 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=77b296a2582b4ea5e4398398e22bd5b4d3323107 commit 77b296a2582b4ea5e4398398e22bd5b4d3323107 Author: Dave Cottlehuber AuthorDate: 2024-10-15 09:28:12 +0000 Commit: Dave Cottlehuber CommitDate: 2024-10-31 19:18:44 +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 (cherry picked from commit 1be84d745bcc11b766ac1fa03afd2c8ea8771737) --- 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 3bfe2d8bfee0..ba57601c1f6c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -22,7 +22,7 @@ CLOUDWARE_TYPES?= AZURE \ BASIC-CLOUDINIT \ EC2 \ GCE \ - OCI \ + ORACLE \ VAGRANT AZURE_FORMAT= vhdf AZURE_FSLIST?= ufs zfs @@ -42,9 +42,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 ac9c1aaa254e..351496dcf6a4 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