From 5715f652bb7fbea2b291b6c186d605d491e96505 Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Fri, 14 Mar 2014 01:03:01 +0000 Subject: [PATCH] wip, fixing c10n --- .../coreos-base/oem-ami/files/cloud-config.yml | 2 +- .../coreos-overlay/coreos-base/oem-ami/files/coreos-c10n | 2 +- .../coreos-base/oem-ami/oem-ami-0.0.1.ebuild | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml index 740e5661b3..675d8f3a88 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml @@ -11,7 +11,7 @@ coreos: [Service] Type=oneshot StandardOutput=journal+console - ExecStart=/usr/share/oem/usr/bin/ec2-ssh-key.sh + ExecStart=/usr/share/oem/usr/bin/ec2-ssh-key - name: ec2-cloudinit.service runtime: yes content: | diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-c10n b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-c10n index 571ffe236b..0789f2e523 100755 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-c10n +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-c10n @@ -68,7 +68,7 @@ if head -n 1 $TMP | grep -q '^#!'; then elif head -n 1 $TMP | grep -q '^#cloud-config'; then # If an etcd discovery URL was found, we can assume the new hotness # will handle bootstrapping, allowing us to clear the c10n token - if head -n 1 $TMP | grep -q 'discovery_url:'; then + if grep -q 'discovery_url:' $TMP; then C10N_TOKEN="" fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild index 463967cf69..033e8a5c83 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild @@ -16,9 +16,10 @@ IUSE="" S="${WORKDIR}" src_install() { - doexe ${FILESDIR}/ec2-ssh-key - doexe ${FILESDIR}/coreos-setup-environment - doexe ${FILESDIR}/coreos-c10n + into "/usr" + dobin ${FILESDIR}/ec2-ssh-key + dobin ${FILESDIR}/coreos-setup-environment + dobin ${FILESDIR}/coreos-c10n insinto "/" doins ${FILESDIR}/cloud-config.yml