From c047e9e91d5c22ee7e97f20c0e8e00b188fb400e Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 13 Mar 2017 17:33:20 -0700 Subject: [PATCH] coreos-base/oem-hyperv: switch to ignition scheme Since there is no cloud-config to drop here, just bring this OEM inline with the others in terms of their structure. --- .../coreos-base/oem-hyperv/files/cloud-config.yml | 8 -------- .../coreos-base/oem-hyperv/files/oem-release | 4 ++++ .../coreos-base/oem-hyperv/oem-hyperv-0.0.3-r1.ebuild | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/cloud-config.yml create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/oem-release diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/cloud-config.yml deleted file mode 100644 index c97ef404bf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/cloud-config.yml +++ /dev/null @@ -1,8 +0,0 @@ -#cloud-config - -coreos: - oem: - id: hyperv - name: Microsoft Hyper-V - version-id: @@OEM_VERSION_ID@@ - bug-report-url: https://issues.coreos.com diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/oem-release new file mode 100644 index 0000000000..e8371b1bd6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/oem-release @@ -0,0 +1,4 @@ +ID=hyperv +VERSION_ID=@@OEM_VERSION_ID@@ +NAME="Microsoft Hyper-V" +BUG_REPORT_URL="https://issues.coreos.com" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.3-r1.ebuild index b7c2b46fa7..e0df989086 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.3-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.3-r1.ebuild @@ -16,12 +16,12 @@ IUSE="" S="${WORKDIR}" src_prepare() { - sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die + sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ + "${FILESDIR}/oem-release" > "${T}/oem-release" || die } src_install() { insinto "/usr/share/oem" - doins "${T}/cloud-config.yml" doins "${FILESDIR}/grub.cfg" + doins "${T}/oem-release" }