From 6493111740fb73cc68bdd25528c8a25ac613187e Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 23 Apr 2014 17:29:59 -0700
Subject: [PATCH] bump(coreos-base/coreos-init): Purge amd64-generic, fix
 btrfs-resize

---
 ...r77.ebuild => coreos-init-0.0.1-r78.ebuild} |  0
 .../coreos-init/coreos-init-9999.ebuild        | 18 ++++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r77.ebuild => coreos-init-0.0.1-r78.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r77.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r78.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r77.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r78.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
index 2443d0c10c..5acf4aca8a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~x86"
 else
-	CROS_WORKON_COMMIT="4099b3f635abc082ec68f4f4e212146e246cb5cc"
+	CROS_WORKON_COMMIT="78d3ccf4f3f2c1684f7b7291d3ecd68b29eb18ab"
 	KEYWORDS="amd64 arm x86"
 fi
 
@@ -24,6 +24,8 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="test symlink-usr"
 
+REQUIRED_USE="symlink-usr"
+
 # Daemons we enable here must installed during build/install in addition to
 # during runtime so the systemd unit enable step works.
 DEPEND="
@@ -41,19 +43,15 @@ RDEPEND="${DEPEND}
 	"
 
 src_install() {
-	if use symlink-usr ; then
-		emake DESTDIR="${D}" install-usr
-		systemd_enable_service local-fs.target remount-root.service
-		systemd_enable_service default.target resize-btrfs.service
-		systemd_enable_service default.target ldsocache.service
-	else
-		emake DESTDIR="${D}" install
-	fi
+	emake DESTDIR="${D}" install
 
+	# Basic system startup
 	systemd_enable_service basic.target coreos-startup.target
+	systemd_enable_service local-fs.target remount-root.service
+	systemd_enable_service default.target resize-btrfs.service
+	systemd_enable_service default.target ldsocache.service
 
 	# Services!
-	systemd_enable_service default.target local-enable.service
 	systemd_enable_service default.target sshd-keygen.service
 	systemd_enable_service default.target sshd.socket
 	systemd_enable_service default.target ssh-key-proc-cmdline.service