From aa83e2f34fae18d90424de329350201df1121134 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Mon, 25 Oct 2021 13:45:01 +0530 Subject: [PATCH 1/8] coreos-base/oem-azure: Install nvidia drivers in regular images Signed-off-by: Sayan Chowdhury --- ...{oem-azure-2.6.0.2.ebuild => oem-azure-2.6.0.2-r1.ebuild} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-2.6.0.2.ebuild => oem-azure-2.6.0.2-r1.ebuild} (88%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.6.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.6.0.2-r1.ebuild similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.6.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.6.0.2-r1.ebuild index 0a0f8a3705..575bba6467 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.6.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.6.0.2-r1.ebuild @@ -15,7 +15,10 @@ IUSE="" # no source directory S="${WORKDIR}" -RDEPEND="~app-emulation/wa-linux-agent-${PV}" +RDEPEND=" + ~app-emulation/wa-linux-agent-${PV} + x11-drivers/nvidia-drivers +" src_prepare() { default From b422471a358e153f507874fde6c37614e797f535 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 26 Oct 2021 20:31:00 +0530 Subject: [PATCH 2/8] oem-ec2-compat: Move the EC2 Pro features into regular images Signed-off-by: Sayan Chowdhury --- .../files/base/base-aws-pro.ign | 37 ------------------- .../oem-ec2-compat/files/base/base-ec2.ign | 20 ++++++++++ ....ebuild => oem-ec2-compat-0.1.2-r2.ebuild} | 24 ++++-------- 3 files changed, 28 insertions(+), 53 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-aws-pro.ign rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.1.2-r1.ebuild => oem-ec2-compat-0.1.2-r2.ebuild} (73%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-aws-pro.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-aws-pro.ign deleted file mode 100644 index 24b1ed4e27..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-aws-pro.ign +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ignition": { - "version": "2.1.0" - }, - "storage": { - "files": [ - { - "filesystem": "root", - "path": "/etc/eks/bootstrap.sh", - "contents": { - "source": "oem:///eks/bootstrap.sh" - }, - "mode": 493 - }, - { - "filesystem": "root", - "path": "/etc/systemd/system/nvidia.service", - "contents": { - "source": "oem:///units/nvidia.service" - }, - "mode": 292 - } - ] - }, - "systemd": { - "units": [ - { - "name": "coreos-metadata-sshkeys@.service", - "enabled": true - }, - { - "name": "nvidia.service", - "enabled": true - } - ] - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign index 9933deb779..6a18954039 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign @@ -12,6 +12,10 @@ "name": "amazon-ssm-agent.service", "enabled": true, "contents": "[Unit]\nDescription=amazon-ssm-agent\nAfter=network-online.target\n\n[Service]\nType=simple\nWorkingDirectory=/usr/share/oem\nExecStart=/usr/share/oem/bin/amazon-ssm-agent\nKillMode=process\nRestart=on-failure\nRestartForceExitStatus=SIGPIPE\nRestartSec=15min\n\n[Install]\nWantedBy=multi-user.target\n" + }, + { + "name": "nvidia.service", + "enabled": true } ] }, @@ -32,6 +36,22 @@ "source": "oem:///ssm/seelog.xml.template" }, "mode": 292 + }, + { + "filesystem": "root", + "path": "/etc/eks/bootstrap.sh", + "contents": { + "source": "oem:///eks/bootstrap.sh" + }, + "mode": 493 + }, + { + "filesystem": "root", + "path": "/etc/systemd/system/nvidia.service", + "contents": { + "source": "oem:///units/nvidia.service" + }, + "mode": 292 } ] } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild similarity index 73% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild index a4377abd31..3978697142 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild @@ -10,15 +10,13 @@ SRC_URI="" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 arm64 x86" -IUSE="ec2 openstack brightbox aws_pro" -REQUIRED_USE="^^ ( ec2 openstack brightbox aws_pro )" +IUSE="ec2 openstack brightbox" +REQUIRED_USE="^^ ( ec2 openstack brightbox )" RDEPEND=" - ec2? ( app-emulation/amazon-ssm-agent ) - aws_pro? ( - coreos-base/flatcar-eks - x11-drivers/nvidia-drivers - ) + ec2? ( app-emulation/amazon-ssm-agent ) + coreos-base/flatcar-eks + x11-drivers/nvidia-drivers " # no source directory @@ -26,13 +24,9 @@ S="${WORKDIR}" src_prepare() { default - if use ec2 || use aws_pro ; then + if use ec2 ; then ID="ami" - if use ec2; then - NAME="Amazon EC2" - else - NAME="Amazon EC2 (Pro)" - fi + NAME="Amazon EC2" HOME_URL="http://aws.amazon.com/ec2/" elif use openstack ; then ID="openstack" @@ -56,7 +50,7 @@ src_prepare() { src_install() { insinto "/usr/share/oem" doins "${T}/oem-release" - if use ec2 || use aws_pro ; then + if use ec2 ; then newins "${FILESDIR}/grub-ec2.cfg" grub.cfg elif use openstack ; then newins "${FILESDIR}/grub-openstack.cfg" grub.cfg @@ -69,7 +63,5 @@ src_install() { doins "${FILESDIR}/base/default.ign" if use ec2 ; then newins "${FILESDIR}/base/base-ec2.ign" base.ign - elif use aws_pro ; then - newins "${FILESDIR}/base/base-aws-pro.ign" base.ign fi } From 59e4a6cfd12fb7e7e9fe28e5984aa3e32ece71e1 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Thu, 17 Feb 2022 19:04:54 +0530 Subject: [PATCH 3/8] x11-drivers/nvidia-{metadata,drivers}: Update to 510.47.03 Signed-off-by: Sayan Chowdhury --- ...drivers-470.57.02.ebuild => nvidia-drivers-510.47.03.ebuild} | 0 .../x11-drivers/nvidia-metadata/files/nvidia-metadata | 2 +- ...tadata-470.57.02.ebuild => nvidia-metadata-510.47.03.ebuild} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/{nvidia-drivers-470.57.02.ebuild => nvidia-drivers-510.47.03.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/{nvidia-metadata-470.57.02.ebuild => nvidia-metadata-510.47.03.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild rename to sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/files/nvidia-metadata b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/files/nvidia-metadata index c2360d74b6..fa7976dc72 100644 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/files/nvidia-metadata +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/files/nvidia-metadata @@ -1,2 +1,2 @@ -NVIDIA_DRIVER_VERSION=470.57.02 +NVIDIA_DRIVER_VERSION=510.47.03 NVIDIA_PRODUCT_TYPE=tesla diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/nvidia-metadata-470.57.02.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/nvidia-metadata-510.47.03.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/nvidia-metadata-470.57.02.ebuild rename to sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/nvidia-metadata-510.47.03.ebuild From 5fe2ba270fee962ea7e21949beaa392fe8e9618c Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Thu, 17 Feb 2022 19:12:40 +0530 Subject: [PATCH 4/8] x11-drivers/nvidia-drivers: Add the changelog updates for 510.47.03 Signed-off-by: Sayan Chowdhury --- .../changelog/security/2022-02-17-nvidia-drivers-510.47.03.md | 1 + .../changelog/updates/2022-02-17-nvidia-drivers-510.47.03.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/security/2022-02-17-nvidia-drivers-510.47.03.md create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-02-17-nvidia-drivers-510.47.03.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-02-17-nvidia-drivers-510.47.03.md b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-02-17-nvidia-drivers-510.47.03.md new file mode 100644 index 0000000000..83bf231a6f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-02-17-nvidia-drivers-510.47.03.md @@ -0,0 +1 @@ +- nvidia-drivers ([CVE-2022-21814](https://nvd.nist.gov/vuln/detail/CVE-2022-21814), [CVE-2022-21813](https://nvd.nist.gov/vuln/detail/CVE-2022-21813)) diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-02-17-nvidia-drivers-510.47.03.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-02-17-nvidia-drivers-510.47.03.md new file mode 100644 index 0000000000..e376ea50f7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-02-17-nvidia-drivers-510.47.03.md @@ -0,0 +1 @@ +- nvidia-drivers ([510.47.03](https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-510-47-03/index.html)) From f076032ed5b977dbf4a27d80c3e3c7689d541dad Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Thu, 17 Feb 2022 19:38:00 +0530 Subject: [PATCH 5/8] oem-azure-pro: Move the Flatcar Pro bits in to regular image Signed-off-by: Sayan Chowdhury --- .../oem-azure-pro/files/base/README | 4 -- .../oem-azure-pro/files/base/base.ign | 37 ------------------ .../oem-azure-pro/files/base/default.ign | 14 ------- .../coreos-base/oem-azure-pro/files/grub.cfg | 16 -------- .../oem-azure-pro/files/oem-release | 5 --- .../oem-azure-pro/files/units/waagent.service | 15 ------- .../coreos-base/oem-azure-pro/metadata.xml | 4 -- .../oem-azure-pro-2.6.0.2.ebuild | 39 ------------------- 8 files changed, 134 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/README delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/base.ign delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/default.ign delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/oem-release delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/units/waagent.service delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.6.0.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/README b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/README deleted file mode 100644 index d128309fef..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/README +++ /dev/null @@ -1,4 +0,0 @@ -These Ignition configs are part of the OEM configuration. Do not modify -them. If you want to write an Ignition config directly to disk, put it in -../config.ign and it will be applied at first boot instead of a config -in userdata. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/base.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/base.ign deleted file mode 100644 index 5c359a9410..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/base.ign +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ignition": { - "version": "2.1.0" - }, - "storage": { - "files": [ - { - "filesystem": "root", - "path": "/etc/systemd/system/waagent.service", - "contents": { - "source": "oem:///units/waagent.service" - }, - "mode": 292 - }, - { - "filesystem": "root", - "path": "/etc/systemd/system/nvidia.service", - "contents": { - "source": "oem:///units/nvidia.service" - }, - "mode": 292 - } - ] - }, - "systemd": { - "units": [ - { - "name": "waagent.service", - "enabled": true - }, - { - "name": "nvidia.service", - "enabled": true - } - ] - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/default.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/default.ign deleted file mode 100644 index 29b7c91e59..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/base/default.ign +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ignition": { - "version": "2.1.0" - }, - "systemd": { - "units": [ - { - "name": "oem-cloudinit.service", - "enabled": true, - "contents": "[Unit]\nDescription=Cloudinit from Azure metadata\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/coreos-cloudinit --oem=azure\n\n[Install]\nWantedBy=multi-user.target\n" - } - ] - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg deleted file mode 100644 index 15e7e50555..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# Flatcar GRUB settings - -set oem_id="azure" - -set linux_append="flatcar.autologin" - -# Azure only has a serial console. -serial --unit=0 --speed=115200 --word=8 --parity=no -terminal_input serial -terminal_output serial - -if [ "$grub_cpu" = arm64 ]; then - set linux_console="console=tty1 console=ttyAMA0,115200n8 earlycon=pl011,0xeffec000" -else - set linux_console="console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200" -fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/oem-release deleted file mode 100644 index 0c5d4d7d9f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/oem-release +++ /dev/null @@ -1,5 +0,0 @@ -ID=azure -VERSION_ID=@@OEM_VERSION_ID@@ -NAME="Microsoft Azure (Pro)" -HOME_URL="https://azure.microsoft.com/" -BUG_REPORT_URL="https://issues.flatcar-linux.org" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/units/waagent.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/units/waagent.service deleted file mode 100644 index cf34281af7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/units/waagent.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Microsoft Azure Agent -Wants=network-online.target sshd-keygen.service -After=network-online.target sshd-keygen.service - -[Service] -Type=simple -Restart=always -RestartSec=5s -Environment=PATH=/usr/share/oem/python/bin:/usr/share/oem/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin -Environment=PYTHONUNBUFFERED=x -ExecStart=/usr/share/oem/bin/waagent -daemon - -[Install] -WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.6.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.6.0.2.ebuild deleted file mode 100644 index 896712e38c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.6.0.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (c) 2013 CoreOS, Inc.. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="OEM suite for Azure" -HOMEPAGE="" -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64" -IUSE="" - -# no source directory -S="${WORKDIR}" - -# This source is a superset of oem-azure and implments the pro bits. The source -# of oem-azure-pro is duplicated from oem-azure because making using of RDEPEND -# would result in the conflict of `base.ign` -RDEPEND=" - ~app-emulation/wa-linux-agent-${PV} - amd64? ( x11-drivers/nvidia-drivers ) -" - -src_prepare() { - default - sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - "${FILESDIR}/oem-release" > "${T}/oem-release" || die -} - -src_install() { - insinto "/usr/share/oem" - doins "${FILESDIR}/grub.cfg" - doins "${T}/oem-release" - doins -r "${FILESDIR}/base" - doins -r "${FILESDIR}/units" - dosym "/usr/bin/true" "/usr/share/oem/bin/eject" -} From d960acc064576a13afd9b78d3b479a8dd80f1a5a Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Thu, 24 Feb 2022 23:39:25 +0530 Subject: [PATCH 6/8] x11-drivers/nvidia-drivers: Use the bucket instead of GCS Signed-off-by: Sayan Chowdhury --- .../x11-drivers/nvidia-drivers/files/bin/setup-nvidia | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia index f113cdc7c7..49f74e6811 100644 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia @@ -24,12 +24,12 @@ function download_flatcar_developer_container() { if [[ "$GROUP" == "developer" ]] then - FLATCAR_DEVELOPER_CONTAINER_URL="https://storage.googleapis.com/flatcar-jenkins/developer/developer/boards/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_DEVELOPER_CONTAINER}.bz2" + FLATCAR_DEVELOPER_CONTAINER_URL="https://bucket.release.flatcar-linux.net/flatcar-jenkins/developer/developer/boards/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_DEVELOPER_CONTAINER}.bz2" else if [[ "$(curl -I -s -o /dev/null -w "%{http_code}" "https://${GROUP}.release.flatcar-linux.net/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_DEVELOPER_CONTAINER}.bz2")" == 200 ]] then FLATCAR_DEVELOPER_CONTAINER_URL="https://${GROUP}.release.flatcar-linux.net/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_DEVELOPER_CONTAINER}.bz2" else - FLATCAR_DEVELOPER_CONTAINER_URL="https://storage.googleapis.com/flatcar-jenkins/${GROUP}/boards/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_DEVELOPER_CONTAINER}.bz2" + FLATCAR_DEVELOPER_CONTAINER_URL="https://bucket.release.flatcar-linux.net/flatcar-jenkins/${GROUP}/boards/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_DEVELOPER_CONTAINER}.bz2" fi fi From 7a0c4794d3071db2e0f2f53ac35b17c9ce7ca923 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Thu, 24 Feb 2022 23:51:27 +0530 Subject: [PATCH 7/8] coreos-base/oem-azure: Add the nvidia.service file to start the service Signed-off-by: Sayan Chowdhury --- .../coreos-base/oem-azure/files/base/base.ign | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/base/base.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/base/base.ign index f222e5180a..5c359a9410 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/base/base.ign +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/base/base.ign @@ -11,6 +11,14 @@ "source": "oem:///units/waagent.service" }, "mode": 292 + }, + { + "filesystem": "root", + "path": "/etc/systemd/system/nvidia.service", + "contents": { + "source": "oem:///units/nvidia.service" + }, + "mode": 292 } ] }, @@ -19,6 +27,10 @@ { "name": "waagent.service", "enabled": true + }, + { + "name": "nvidia.service", + "enabled": true } ] } From b7e0c422d4466958b8e1fc969cac9951c2d2ac70 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Mon, 28 Feb 2022 15:54:59 +0530 Subject: [PATCH 8/8] changelog/changes: Add the changelog entry for Flatcar Pro merge Signed-off-by: Sayan Chowdhury --- .../changes/2022-02-28-merge-pro-features-into-regular-image.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-02-28-merge-pro-features-into-regular-image.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-02-28-merge-pro-features-into-regular-image.md b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-02-28-merge-pro-features-into-regular-image.md new file mode 100644 index 0000000000..1730c3ee55 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-02-28-merge-pro-features-into-regular-image.md @@ -0,0 +1 @@ +- Merge the Flatcar Pro features into the regular Flatcar images ([#1679](https://github.com/flatcar-linux/coreos-overlay/pull/1679))