From e688b4456780b7b832760d1e8515bf4b09603593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 3 Feb 2021 14:46:48 +0100 Subject: [PATCH 1/2] coreos-base/coreos-init: Show OEM in motd This pulls in https://github.com/kinvolk/init/pull/34 --- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 52a55c157c..86047e352a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="959ca2e599d29eaa6193bd7dd6a6e3fa3e9e1617" # flatcar-master + CROS_WORKON_COMMIT="cdfee3f8a54b995eed52e93280b231a93f2e1013" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From 2604b8d782cfee6455b4e15daa8ecf5a9ec56115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 3 Feb 2021 14:49:23 +0100 Subject: [PATCH 2/2] coreos-base/oem-*: add Pro to OEM name where applicable Using the change in https://github.com/kinvolk/init/pull/34 we can show the OEM on the motd, and by including "Pro" in the OEM name we can also show whether it is a Pro image or not. Later this may be revisited if the /usr/../os-release file is the place for it. --- .../coreos-base/oem-azure-pro/files/oem-release | 2 +- .../coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 index faf1676145..0c5d4d7d9f 100644 --- 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 @@ -1,5 +1,5 @@ ID=azure VERSION_ID=@@OEM_VERSION_ID@@ -NAME="Microsoft Azure" +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-ec2-compat/oem-ec2-compat-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild index 81f2781645..c315ace241 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild @@ -29,7 +29,11 @@ S="${WORKDIR}" src_prepare() { if use ec2 || use aws_pro ; then ID="ami" - NAME="Amazon EC2" + if use ec2; then + NAME="Amazon EC2" + else + NAME="Amazon EC2 (Pro)" + fi HOME_URL="http://aws.amazon.com/ec2/" elif use openstack ; then ID="openstack"