From d29a2cb0d8d1824ed9264b499c9a39237dd3efb9 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Mon, 31 Mar 2014 11:20:35 -0700 Subject: [PATCH] fix(oem-vagrant): Ignore missing /etc/environment --- .../coreos-base/oem-vagrant/files/cloud-config.yml | 2 +- ...{oem-vagrant-0.0.1-r4.ebuild => oem-vagrant-0.0.1-r5.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/{oem-vagrant-0.0.1-r4.ebuild => oem-vagrant-0.0.1-r5.ebuild} (100%) 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 7d28afa66f..b67245b11f 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 @@ -18,6 +18,6 @@ coreos: [Service] Type=oneshot - EnvironmentFile=/etc/environment + EnvironmentFile=-/etc/environment ExecStart=/usr/bin/coreos-cloudinit --from-file /var/lib/coreos-vagrant/user-data RemainAfterExit=yes diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r5.ebuild