From nobody Tue Oct 15 09:28:42 2024 X-Original-To: dev-commits-src-main@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 4XSTLL2cd9z5Yf2q; Tue, 15 Oct 2024 09:28:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XSTLL2724z4HbS; Tue, 15 Oct 2024 09:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728984522; 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=WxH7SnDH7pPpYhGU4rclXcMkKgAawPdDaaEDkdpS85M=; b=VIbkNuzKXnS2UxndRCacOfcU9HIcugP9AF3uqfj3DXnrY103iTBtyIMR4NZpduk/U7v9LF 7/13ZQGHcRO0FCdWGCbrED1YNpsPuY+phrX3xK7PcS6/j3f/fOPppOo7KjHOHqU7lRsX1y a8yavn6n9OqD9Z017O/0AcNdN7SajPM5F3DmS3cQICT6fU+wpsm8puC2sqadHLyqCzJwOo n9GDPa2PTFhQopuS+LDzfucA6DxI1Otyw34O+jvaaAAAiw/ypMqCISefjpHQ/50yDa7t0b cASy8crgyrdztGZlbHnXiG5SPD2XJ10+X1ZgwIPnMWfp1/87vtGvz1jKlqT57g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728984522; 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=WxH7SnDH7pPpYhGU4rclXcMkKgAawPdDaaEDkdpS85M=; b=d/ASnX1NbH33ZTobZ58tm71jZoeSTmQAz4gHxFBw8z1QCX0btl9YTTiE1+C286hrPK8PoR YvIyirGzDT7Dj67O4NaUIFUvxvx1M2DCJhtn3hOWHU1Yp2Zg6XyKJPfaI+XqbTVM5DBlnk Zz7aDxk523cGgIczoADE6sWLQbwd5Yg5gBK6VXHXqe9UG6fgt2JhuUCmX+R1535vay8HeC gxW50JG5hxeO+LSsSamGR40JsgVXfKurROU6Jc8wCZUCMxPQbUgI29Fl8IMQUKGuLKub8C HZUkxmFNRuePbclIrxEkPuKg8F1XbORDwctf1pBCq4Rz5UKRYcWdtVxXc3wQhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728984522; a=rsa-sha256; cv=none; b=kujpDwdzrLYXb9WWmvhNqV/9rd5iEB8R89pPrWsXYzhGQ5CYEW//Tv2y8WJ1MGtKyQ8iqB URC3U120NMUNSYMUHl5XHuvKD+s5Zz9puVvS2bB1eItH+qnmTSLq+riVjNCH+wuoR5aodY EexBZc0i8gR7+74zREfGQ0fluvetT+e5l2zjEb+gYEhYzheRWqcDITHwhLkD8WDV6SUi8k C3o3t7OAHh+qytHZngRdCCThsT1TldMDQI+/YfpwcMj1xZHQF1+tr68rBmve9rWbQqf83n 516H6nu5ZEmh3uCNbzWTqiV3D9YfsGncren4OaXeHurhi75Oisz/qcVstpC01w== 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 4XSTLL1kBMzGyV; Tue, 15 Oct 2024 09:28:42 +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 49F9SgeO011692; Tue, 15 Oct 2024 09:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49F9SgNc011689; Tue, 15 Oct 2024 09:28:42 GMT (envelope-from git) Date: Tue, 15 Oct 2024 09:28:42 GMT Message-Id: <202410150928.49F9SgNc011689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 1be84d745bcc - main - release: move OCI to ORACLE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1be84d745bcc11b766ac1fa03afd2c8ea8771737 Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=1be84d745bcc11b766ac1fa03afd2c8ea8771737 commit 1be84d745bcc11b766ac1fa03afd2c8ea8771737 Author: Dave Cottlehuber AuthorDate: 2024-10-15 09:28:12 +0000 Commit: Dave Cottlehuber 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