From 85e37cb7a6af392084aa63678ba45d5be32cede4 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 1 Jul 2014 22:23:29 -0400 Subject: [PATCH] oem-ec2-compat: remove dependency on coreos-setup-environment The coreos-setup-environment no longer generates /etc/environment on systems using this OEM package so remove the requirement. --- .../coreos-base/oem-ec2-compat/files/cloud-config.yml | 3 --- ...-ec2-compat-0.0.2.ebuild => oem-ec2-compat-0.0.2-r1.ebuild} | 0 2 files changed, 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.0.2.ebuild => oem-ec2-compat-0.0.2-r1.ebuild} (100%) 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 index f393475480..06a22f3d00 100644 --- 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 @@ -12,12 +12,9 @@ coreos: content: | [Unit] Description=Cloudinit from EC2-style metadata - Requires=coreos-setup-environment.service - After=coreos-setup-environment.service [Service] Type=oneshot - EnvironmentFile=/etc/environment ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --from-metadata-service oem: id: @@OEM_ID@@ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r1.ebuild