From 587ad57d45fd868bd2f508e4735d39497fe8d5b1 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Tue, 25 Mar 2014 14:45:43 -0700 Subject: [PATCH 1/2] fix(oem-vagrant): Use sentinel to limit coreos-cloudinit to one run --- .../coreos-base/oem-vagrant/files/cloud-config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml index 17890ae0f6..7d28afa66f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml @@ -13,7 +13,11 @@ coreos: - name: coreos-cloudinit-vagrant.service runtime: no content: | + [Unit] + ConditionFileNotEmpty=/var/lib/coreos-vagrant/user-data + [Service] Type=oneshot EnvironmentFile=/etc/environment ExecStart=/usr/bin/coreos-cloudinit --from-file /var/lib/coreos-vagrant/user-data + RemainAfterExit=yes From bddf7dee74cff9e3b6feeae78a2f8c355f26b874 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Tue, 25 Mar 2014 20:07:58 -0700 Subject: [PATCH 2/2] bump(coreos-cloudinit): Upgrade to v0.3.1 --- ...eos-cloudinit-0.3.0.ebuild => coreos-cloudinit-0.3.1.ebuild} | 0 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-0.3.0.ebuild => coreos-cloudinit-0.3.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index fdc01c19a3..ce6e54886d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="e68134d88480595211ea594b10be3316f19085b5" # v0.3.0 + CROS_WORKON_COMMIT="4977c774d81d1326e0099692afc87fa002c003ad" # v0.3.1 KEYWORDS="amd64" fi