From ba1ed88eea453799c36cf71ec12380322594e7a5 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Tue, 20 Oct 2015 15:18:23 -0700
Subject: [PATCH] oem-*: use kernel parameter instead of oem-release

---
 .../coreos-overlay/coreos-base/oem-azure/files/grub.cfg      | 2 ++
 .../coreos-overlay/coreos-base/oem-azure/files/oem-release   | 1 -
 ...oem-azure-2.0.12-r1.ebuild => oem-azure-2.0.12-r2.ebuild} | 1 -
 .../coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg | 3 +++
 .../coreos-base/oem-cloudsigma/files/oem-release             | 1 -
 ...m-cloudsigma-0.0.2.ebuild => oem-cloudsigma-0.0.3.ebuild} | 2 +-
 .../coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg | 3 +++
 .../coreos-base/oem-cloudstack/files/oem-release             | 1 -
 ...m-cloudstack-0.0.2.ebuild => oem-cloudstack-0.0.3.ebuild} | 2 +-
 .../coreos-base/oem-digitalocean/files/grub.cfg              | 3 +++
 .../coreos-base/oem-digitalocean/files/oem-release           | 1 -
 ...gitalocean-0.0.3.ebuild => oem-digitalocean-0.0.4.ebuild} | 2 +-
 .../coreos-base/oem-ec2-compat/files/grub-brightbox.cfg      | 3 +++
 .../coreos-base/oem-ec2-compat/files/grub-ec2.cfg            | 2 ++
 .../coreos-base/oem-ec2-compat/files/grub-openstack.cfg      | 3 +++
 .../coreos-base/oem-ec2-compat/files/oem-release-brightbox   | 1 -
 .../coreos-base/oem-ec2-compat/files/oem-release-ec2         | 1 -
 .../coreos-base/oem-ec2-compat/files/oem-release-openstack   | 1 -
 ...m-ec2-compat-0.0.5.ebuild => oem-ec2-compat-0.0.6.ebuild} | 5 ++---
 .../coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg   | 3 +++
 .../coreos-base/oem-exoscale/files/oem-release               | 1 -
 .../{oem-exoscale-0.0.3.ebuild => oem-exoscale-0.0.4.ebuild} | 2 +-
 .../coreos-overlay/coreos-base/oem-gce/files/grub.cfg        | 2 ++
 .../coreos-overlay/coreos-base/oem-gce/files/oem-release     | 1 -
 .../oem-gce/{oem-gce-0.0.5.ebuild => oem-gce-0.0.6.ebuild}   | 1 -
 .../coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg     | 3 +++
 .../coreos-overlay/coreos-base/oem-hyperv/files/oem-release  | 1 -
 .../{oem-hyperv-0.0.2.ebuild => oem-hyperv-0.0.3.ebuild}     | 2 +-
 .../coreos-overlay/coreos-base/oem-interoute/files/grub.cfg  | 3 +++
 .../coreos-base/oem-interoute/files/oem-release              | 1 -
 ...oem-interoute-0.0.2.ebuild => oem-interoute-0.0.3.ebuild} | 2 +-
 .../coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg | 3 +++
 .../coreos-base/oem-niftycloud/files/oem-release             | 1 -
 ...m-niftycloud-0.0.2.ebuild => oem-niftycloud-0.0.3.ebuild} | 2 +-
 .../coreos-overlay/coreos-base/oem-packet/files/grub.cfg     | 3 +++
 .../coreos-overlay/coreos-base/oem-packet/files/oem-release  | 1 -
 .../{oem-packet-0.0.2.ebuild => oem-packet-0.0.3.ebuild}     | 2 +-
 .../coreos-base/oem-rackspace-onmetal/files/grub.cfg         | 2 ++
 .../coreos-base/oem-rackspace-onmetal/files/oem-release      | 1 -
 ...metal-0.0.7.ebuild => oem-rackspace-onmetal-0.0.8.ebuild} | 1 -
 .../coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg  | 3 +++
 .../coreos-base/oem-rackspace/files/oem-release              | 1 -
 ...oem-rackspace-0.0.2.ebuild => oem-rackspace-0.0.3.ebuild} | 2 +-
 .../coreos-base/oem-vagrant-key/files/grub.cfg               | 3 +++
 .../coreos-base/oem-vagrant-key/files/oem-release            | 1 -
 ...vagrant-key-0.0.2.ebuild => oem-vagrant-key-0.0.3.ebuild} | 2 +-
 .../coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg    | 3 +++
 .../coreos-overlay/coreos-base/oem-vagrant/files/oem-release | 1 -
 .../{oem-vagrant-0.0.2.ebuild => oem-vagrant-0.0.3.ebuild}   | 2 +-
 .../coreos-overlay/coreos-base/oem-vmware/files/grub.cfg     | 3 +++
 .../coreos-overlay/coreos-base/oem-vmware/files/oem-release  | 1 -
 ...m-vmware-9.10.0-r2.ebuild => oem-vmware-9.10.0-r3.ebuild} | 2 +-
 .../coreos-overlay/coreos-base/oem-xendom0/files/grub.cfg    | 2 ++
 .../coreos-overlay/coreos-base/oem-xendom0/files/oem-release | 1 -
 ...m-xendom0-4.4.1-r1.ebuild => oem-xendom0-4.4.1-r2.ebuild} | 1 -
 55 files changed, 66 insertions(+), 38 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-2.0.12-r1.ebuild => oem-azure-2.0.12-r2.ebuild} (94%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/{oem-cloudsigma-0.0.2.ebuild => oem-cloudsigma-0.0.3.ebuild} (93%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/{oem-cloudstack-0.0.2.ebuild => oem-cloudstack-0.0.3.ebuild} (95%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/{oem-digitalocean-0.0.3.ebuild => oem-digitalocean-0.0.4.ebuild} (93%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-brightbox
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-ec2
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-openstack
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.0.5.ebuild => oem-ec2-compat-0.0.6.ebuild} (87%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/{oem-exoscale-0.0.3.ebuild => oem-exoscale-0.0.4.ebuild} (95%)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/{oem-gce-0.0.5.ebuild => oem-gce-0.0.6.ebuild} (96%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/{oem-hyperv-0.0.2.ebuild => oem-hyperv-0.0.3.ebuild} (93%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/{oem-interoute-0.0.2.ebuild => oem-interoute-0.0.3.ebuild} (96%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/{oem-niftycloud-0.0.2.ebuild => oem-niftycloud-0.0.3.ebuild} (95%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/{oem-packet-0.0.2.ebuild => oem-packet-0.0.3.ebuild} (94%)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/{oem-rackspace-onmetal-0.0.7.ebuild => oem-rackspace-onmetal-0.0.8.ebuild} (94%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.2.ebuild => oem-rackspace-0.0.3.ebuild} (96%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/{oem-vagrant-key-0.0.2.ebuild => oem-vagrant-key-0.0.3.ebuild} (91%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/{oem-vagrant-0.0.2.ebuild => oem-vagrant-0.0.3.ebuild} (94%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/{oem-vmware-9.10.0-r2.ebuild => oem-vmware-9.10.0-r3.ebuild} (94%)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/oem-release
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/{oem-xendom0-4.4.1-r1.ebuild => oem-xendom0-4.4.1-r2.ebuild} (94%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
index e6bc284261..752aa3277b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
@@ -1,5 +1,7 @@
 # CoreOS GRUB settings
 
+set oem_id="azure"
+
 # Azure only has a serial console.
 set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 systemd.journald.forward_to_console=yes"
 serial com0 --speed=115200 --word=8 --parity=no
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/oem-release
deleted file mode 100644
index 56951b80f7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=azure
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12-r2.ebuild
similarity index 94%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12-r2.ebuild
index f8ded51935..4144fe759f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12-r2.ebuild
@@ -26,5 +26,4 @@ src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
 	doins "${FILESDIR}/grub.cfg"
-	doins "${FILESDIR}/oem-release"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg
new file mode 100644
index 0000000000..8340b10a9d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="cloudsigma"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/oem-release
deleted file mode 100644
index 39fbafdcac..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=cloudsigma
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3.ebuild
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3.ebuild
index f3327589fd..4fcbd33c51 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3.ebuild
@@ -22,5 +22,5 @@ src_prepare() {
 src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg
new file mode 100644
index 0000000000..505593ae25
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="cloudstack"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/oem-release
deleted file mode 100644
index 95e31c9a40..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=cloudstack
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.3.ebuild
similarity index 95%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.3.ebuild
index 134c9d4fcf..0c12b6ee08 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.3.ebuild
@@ -33,5 +33,5 @@ src_install() {
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg
new file mode 100644
index 0000000000..f35a82118c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="digitalocean"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release
deleted file mode 100644
index a3d68a9e5f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=digitalocean
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.4.ebuild
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.4.ebuild
index 8e8ca95c4a..f36c5f547c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.4.ebuild
@@ -22,5 +22,5 @@ src_prepare() {
 src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg
new file mode 100644
index 0000000000..f8e8bd5712
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings for EC2
+
+set oem_id="brightbox"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
index a31d13268b..477b1ce83f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
@@ -1,5 +1,7 @@
 # CoreOS GRUB settings for EC2
 
+set oem_id="ec2"
+
 # Blacklist the Xen framebuffer module so it doesn't get loaded at boot
 # Disable `ens3` style names, so eth0 is used for both ixgbevf or xen.
 set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0 systemd.journald.forward_to_console=yes"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg
new file mode 100644
index 0000000000..fbf50a002d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings for EC2
+
+set oem_id="openstack"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-brightbox b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-brightbox
deleted file mode 100644
index 98ba583717..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-brightbox
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=brightbox
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-ec2 b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-ec2
deleted file mode 100644
index 922e99e1ad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-ec2
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=ec2
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-openstack b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-openstack
deleted file mode 100644
index 3004c62255..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-openstack
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=openstack
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.6.ebuild
similarity index 87%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.6.ebuild
index a5046d4216..77a0127edb 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.6.ebuild
@@ -45,10 +45,9 @@ src_install() {
 	doins "${T}/cloud-config.yml"
 	if use ec2 ; then
 		newins "${FILESDIR}/grub-ec2.cfg" grub.cfg
-		newins "${FILESDIR}/oem-release-ec2" oem-release
 	elif use openstack ; then
-		newins "${FILESDIR}/oem-release-openstack" oem-release
+		newins "${FILESDIR}/grub-openstack.cfg" grub.cfg
 	elif use brightbox ; then
-		newins "${FILESDIR}/oem-release-brightbox" oem-release
+		newins "${FILESDIR}/grub-brightbox.cfg" grub.cfg
 	fi
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg
new file mode 100644
index 0000000000..b5dd7b9604
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="exoscale"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/oem-release
deleted file mode 100644
index 70b70728ce..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=exoscale
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.4.ebuild
similarity index 95%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.4.ebuild
index 04b23dfca2..f07a772422 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.4.ebuild
@@ -33,5 +33,5 @@ src_install() {
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg
index a9408832ab..74020d1caf 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg
@@ -1,5 +1,7 @@
 # CoreOS GRUB settings
 
+set oem_id="gce"
+
 # GCE only has a serial console.
 set linux_append="systemd.journald.forward_to_console=yes"
 set linux_console="console=ttyS0,115200n8"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/oem-release
deleted file mode 100644
index d3e39c1e3d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=gce
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.6.ebuild
similarity index 96%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.6.ebuild
index d1d6863176..17fb643528 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.6.ebuild
@@ -35,5 +35,4 @@ src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
 	doins "${FILESDIR}/grub.cfg"
-	doins "${FILESDIR}/oem-release"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg
new file mode 100644
index 0000000000..b7906af6ba
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="hyperv"
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
deleted file mode 100644
index e481f67e18..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=hyperv
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.3.ebuild
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.3.ebuild
index eed71460bb..b7c2b46fa7 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.3.ebuild
@@ -23,5 +23,5 @@ src_prepare() {
 src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg
new file mode 100644
index 0000000000..89f5a0e213
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="interoute"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/oem-release
deleted file mode 100644
index e385a942c0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=interoute
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3.ebuild
similarity index 96%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3.ebuild
index 350b6831ba..a4c1029e8b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3.ebuild
@@ -38,5 +38,5 @@ src_install() {
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg
new file mode 100644
index 0000000000..4bc1e8bcbf
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="niftycloud"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/oem-release
deleted file mode 100644
index 488f9bcc6d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=niftycloud
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3.ebuild
similarity index 95%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3.ebuild
index 9b17404f7e..0324c92724 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3.ebuild
@@ -33,5 +33,5 @@ src_install() {
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg
new file mode 100644
index 0000000000..11997a702f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="packet"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release
deleted file mode 100644
index 6645a06bb0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=packet
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.3.ebuild
similarity index 94%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.3.ebuild
index 8cd051bae7..4f5b9e8cb4 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.3.ebuild
@@ -26,5 +26,5 @@ src_install() {
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
index 8542fd65e2..d834fc6cee 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
@@ -1,5 +1,7 @@
 # CoreOS GRUB settings
 
+set oem_id="rackspace-onmetal"
+
 # Rackspace wanted a longer timeout, I forget why. (15 seconds)
 set timeout=15
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/oem-release
deleted file mode 100644
index 3058068250..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=rackspace-onmetal
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.8.ebuild
similarity index 94%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.8.ebuild
index 630f940453..f78486240c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.7.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.8.ebuild
@@ -23,5 +23,4 @@ src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
 	doins "${FILESDIR}/grub.cfg"
-	doins "${FILESDIR}/oem-release"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg
new file mode 100644
index 0000000000..e500d8c7ce
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="rackspace"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/oem-release
deleted file mode 100644
index 75e1bc5810..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=rackspace
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.3.ebuild
similarity index 96%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.3.ebuild
index c6b05eef03..6dec13c100 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.3.ebuild
@@ -34,7 +34,7 @@ src_install() {
 	rsync --exclude=".git" -aq "${S}/" "${D}/usr/share/oem/nova-agent/" || die
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 
 	into "/usr/share/oem"
 	dobin "${FILESDIR}/coreos-setup-environment"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg
new file mode 100644
index 0000000000..964f58ab6c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="vagrant"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/oem-release
deleted file mode 100644
index 567c3cceed..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=vagrant
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3.ebuild
similarity index 91%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3.ebuild
index 8b1af329d9..ef997f3477 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3.ebuild
@@ -18,5 +18,5 @@ S="${WORKDIR}"
 src_install() {
 	insinto "/usr/share/oem"
 	doins "${FILESDIR}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg
new file mode 100644
index 0000000000..964f58ab6c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="vagrant"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/oem-release
deleted file mode 100644
index 567c3cceed..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=vagrant
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild
similarity index 94%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild
index 963f956583..f05bd704c5 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild
@@ -24,7 +24,7 @@ src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
 	doins -r "${FILESDIR}/box"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 
 	into "/usr/share/oem"
 	dobin "${FILESDIR}/coreos-setup-environment"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg
new file mode 100644
index 0000000000..9870f6b70d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg
@@ -0,0 +1,3 @@
+# CoreOS GRUB settings
+
+set oem_id="vmware"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/oem-release
deleted file mode 100644
index 94868bb5cb..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=vmware
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r3.ebuild
similarity index 94%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r3.ebuild
index 3ac445d2d8..619e8902e8 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r3.ebuild
@@ -28,5 +28,5 @@ src_prepare() {
 src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
-	doins "${FILESDIR}/oem-release"
+	doins "${FILESDIR}/grub.cfg"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/grub.cfg
index 1a524b6c84..e73d856ecc 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/grub.cfg
@@ -1,5 +1,7 @@
 # Boot CoreOS as Xen Domain0
 
+set oem_id="xendom0"
+
 set default=coreos-xen
 
 set xen_console="console=vga,com1 com1=115200,8n1"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/oem-release
deleted file mode 100644
index 42e3e6b877..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/oem-release
+++ /dev/null
@@ -1 +0,0 @@
-OEM_ID=xendom0
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r2.ebuild
similarity index 94%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r2.ebuild
index bec648111f..8d21c0add9 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r2.ebuild
@@ -26,5 +26,4 @@ src_install() {
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
 	doins "${T}/grub.cfg"
-	doins "${FILESDIR}/oem-release"
 }