From 50358447a8d5d13d77c1b4a68d0b292cc4ae979c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 3 Apr 2014 17:08:36 -0700 Subject: [PATCH] fix(coreos-base/oem-vagrant): Use generic cloud config unit. --- .../oem-vagrant/files/cloud-config.yml | 15 +-------------- ....0.1-r6.ebuild => oem-vagrant-0.0.1-r7.ebuild} | 0 2 files changed, 1 insertion(+), 14 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/{oem-vagrant-0.0.1-r6.ebuild => oem-vagrant-0.0.1-r7.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 529a4b16ab..8b3f7cbb59 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 @@ -7,20 +7,7 @@ coreos: content: | [Path] PathExists=/var/lib/coreos-vagrant/user-data - - [Install] - WantedBy=multi-user.target - - 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 + Unit=user-cloudinit@var-lib-coreos\x2dvagrant-user\x2ddata.service oem: id: vagrant name: Vagrant diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r7.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r6.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r7.ebuild