diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml deleted file mode 100644 index 1ee31b6930..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml +++ /dev/null @@ -1,43 +0,0 @@ -#cloud-config - -coreos: - units: - - name: etcd.service - runtime: true - drop-ins: - - name: 10-oem.conf - content: | - [Service] - Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 - - - name: etcd2.service - runtime: true - drop-ins: - - name: 10-oem.conf - content: | - [Service] - Environment=ETCD_ELECTION_TIMEOUT=1200 - - - name: user-configdrive.service - mask: yes - - - name: user-configvirtfs.service - mask: yes - - - name: oem-cloudinit.service - command: restart - runtime: yes - content: | - [Unit] - Description=Cloudinit from EC2-style metadata - - [Service] - Type=oneshot - ExecStart=/usr/bin/coreos-cloudinit --oem=ec2-compat - - oem: - id: @@OEM_ID@@ - name: @@OEM_NAME@@ - version-id: @@OEM_VERSION_ID@@ - home-url: @@OEM_HOME_URL@@ - bug-report-url: https://issues.coreos.com diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release new file mode 100644 index 0000000000..c53858d5f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release @@ -0,0 +1,5 @@ +ID=@@OEM_ID@@ +VERSION_ID=@@OEM_VERSION_ID@@ +NAME="@@OEM_NAME@@" +HOME_URL="@@OEM_HOME_URL@@" +BUG_REPORT_URL="https://issues.coreos.com" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.7-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.0.ebuild similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.7-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.0.ebuild index fc6e4883df..d3cd9d290b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.7-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.0.ebuild @@ -37,12 +37,12 @@ src_prepare() { -e "s\\@@OEM_NAME@@\\${NAME}\\g" \ -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ -e "s\\@@OEM_HOME_URL@@\\${HOME_URL}\\g" \ - "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die + "${FILESDIR}/oem-release" > "${T}/oem-release" || die } src_install() { insinto "/usr/share/oem" - doins "${T}/cloud-config.yml" + doins "${T}/oem-release" if use ec2 ; then newins "${FILESDIR}/grub-ec2.cfg" grub.cfg elif use openstack ; then