From 65820676f606212a260c8aceafc2eef2972f7a1d Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 3 Apr 2014 16:11:02 -0700
Subject: [PATCH] churn(coreos-base/coreos-cloudinit): Move units into
 cloudinit repo.

---
 ...t-0.4.0.ebuild => coreos-cloudinit-0.4.1.ebuild} |  0
 .../coreos-cloudinit/coreos-cloudinit-9999.ebuild   | 12 +++++++-----
 .../coreos-cloudinit/files/cloud-config.target      |  9 ---------
 .../files/coreos-cloudinit@.service                 | 13 -------------
 4 files changed, 7 insertions(+), 27 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-0.4.0.ebuild => coreos-cloudinit-0.4.1.ebuild} (100%)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.4.1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.4.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.4.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 0e0271e5bb..8155cab751 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,11 +9,11 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64"
 else
-	CROS_WORKON_COMMIT="0fddd1735d013b6e6c78b232329c0ea4d5b709be"  # v0.4.0
+	CROS_WORKON_COMMIT="10d73930d9b352c6976e6a53009a4e4c8da04a28"  # v0.4.1
 	KEYWORDS="amd64"
 fi
 
-inherit cros-workon systemd
+inherit cros-workon systemd udev
 
 DESCRIPTION="coreos-cloudinit"
 HOMEPAGE="https://github.com/coreos/coreos-cloudinit"
@@ -36,7 +36,9 @@ src_compile() {
 
 src_install() {
 	dobin ${S}/bin/coreos-cloudinit
-	systemd_dounit "${FILESDIR}"/coreos-cloudinit@.service
-	systemd_dounit "${FILESDIR}"/cloud-config.target
-	systemd_enable_service default.target cloud-config.target
+	udev_dorules units/*.rules
+	systemd_dounit units/*.service
+	systemd_dounit units/*.target
+	systemd_enable_service default.target system-config.target
+	systemd_enable_service default.target user-config.target
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target
deleted file mode 100644
index 97029e1a36..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-# Load OEM and coreos-install cloud-configs by default
-Requires=coreos-cloudinit@usr-share-oem-cloud\x2dconfig.yml.service
-After=coreos-cloudinit@usr-share-oem-cloud\x2dconfig.yml.service
-Requires=coreos-cloudinit@var-lib-coreos\x2dinstall-user_data.service
-After=coreos-cloudinit@var-lib-coreos\x2dinstall-user_data.service
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service
deleted file mode 100644
index 1051bdb063..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Load cloud-config from %f
-Requires=dbus.service
-After=dbus.service
-RequiresMountsFor=%f
-ConditionFileNotEmpty=%f
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/coreos-cloudinit --from-file=%f
- 
-[Install]
-WantedBy=cloud-config.target