From 7575dfa11abae569faa968532ebeb1d6889db695 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 8 Aug 2013 13:11:14 -0400
Subject: [PATCH 1/7] fix(app-emulation/qemu): Remove unused architectures.

We don't have any arm or i386 targets right now so they can go away.
---
 .../coreos-overlay/profiles/default/linux/package.use           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
index 8fe6e5994b..f9d3cff6c1 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
@@ -36,7 +36,7 @@ net-misc/dhcpcd -crash
 # this comment was here:
 # build kvm with X and sdl so we have an option of running it with local
 # display without VNC
-app-emulation/qemu	aio caps curl jpeg ncurses png python seccomp threads uuid vhost-net vnc qemu_softmmu_targets_arm qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64
+app-emulation/qemu	aio caps curl jpeg ncurses png python seccomp threads uuid vhost-net vnc qemu_softmmu_targets_x86_64
 dev-libs/libaio		static-libs
 cross-armv7a-cros-linux-gnueabi/gcc   hardfp
 cross-armv6j-cros-linux-gnueabi/gcc   hardfp -thumb

From 73b14d27cf77d2837941963ae795486546e6c6df Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 8 Aug 2013 13:15:00 -0400
Subject: [PATCH 2/7] feat(sys-kernel/coreos-kernel): Add 9P virtio fs support.

This allows qemu virtual machines to access plain directories on the
host system in addition to the usual disk/filesystem images.
---
 .../coreos-overlay/eclass/cros-kernel/x86_64_defconfig    | 8 ++++++--
 .../coreos-overlay/profiles/default/linux/package.use     | 2 +-
 ...ernel-3.10.5.ebuild => coreos-kernel-3.10.5-r1.ebuild} | 0
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.10.5.ebuild => coreos-kernel-3.10.5-r1.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig
index d8dc877248..311e35eef7 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.5 Kernel Configuration
+# Linux/x86 3.10.1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -1008,7 +1008,9 @@ CONFIG_FIB_RULES=y
 # CONFIG_WIRELESS is not set
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_DEBUG is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
@@ -2538,6 +2540,8 @@ CONFIG_SUNRPC_DEBUG=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
index f9d3cff6c1..f896ae9c45 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
@@ -36,7 +36,7 @@ net-misc/dhcpcd -crash
 # this comment was here:
 # build kvm with X and sdl so we have an option of running it with local
 # display without VNC
-app-emulation/qemu	aio caps curl jpeg ncurses png python seccomp threads uuid vhost-net vnc qemu_softmmu_targets_x86_64
+app-emulation/qemu	aio caps curl jpeg ncurses png python seccomp threads uuid vhost-net virtfs vnc xattr qemu_softmmu_targets_x86_64
 dev-libs/libaio		static-libs
 cross-armv7a-cros-linux-gnueabi/gcc   hardfp
 cross-armv6j-cros-linux-gnueabi/gcc   hardfp -thumb
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r1.ebuild

From 741c2aa70c7b1fe8999abc3654fa9edb09849342 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sat, 10 Aug 2013 14:46:05 -0400
Subject: [PATCH 3/7] feat(coreos-base/coreos-base): Add default vimrc so vim
 acts like vim.

Because, I mean, really.
---
 ...e-0-r64.ebuild => coreos-base-0-r65.ebuild} |  0
 .../coreos-base/coreos-base-0.ebuild           |  4 ++++
 .../coreos-base/coreos-base/files/vimrc        | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/{coreos-base-0-r64.ebuild => coreos-base-0-r65.ebuild} (100%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r64.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r65.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r64.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r65.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
index 9d3660a2bf..f3b886d870 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
@@ -128,6 +128,10 @@ src_install() {
 		# Insert glibc's nsswitch.conf since that is installed weirdly
 		doins "${FILESDIR}"/nsswitch.conf
 
+		# Insert a mini vimrc to avoid driving everyone insane
+		insinto /etc/vim
+		doins "${FILESDIR}"/vimrc
+
 		# Symlink /etc/localtime to something on the stateful partition, which we
 		# can then change around at runtime.
 		dosym /var/lib/timezone/localtime /etc/localtime || die
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc
new file mode 100644
index 0000000000..dd436fcb36
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc
@@ -0,0 +1,18 @@
+" Minimal configuration file for Vim on CoreOS
+"
+" The vim package is installed with USE=minimal to avoid installing lots of
+" extra files but that doesn't mean we like vim acting as if it were vi.
+
+" General settings from Gentoo's default vimrc:
+set nocompatible        " Use Vim defaults (much better!)
+set bs=2                " Allow backspacing over everything in insert mode
+set ruler               " Show the cursor position all the time
+set nomodeline          " We don't allow modelines by default
+
+" Read vimrc from the state partition if it exists.
+if filereadable("/media/state/etc/vim/vimrc")
+  source /etc/vim/vimrc
+endif
+if filereadable("/media/state/etc/vim/vimrc.local")
+  source /etc/vim/vimrc.local
+endif

From 3e42b6aded0342b6b85cab5d73da22646f5d100a Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 11 Aug 2013 13:00:02 -0400
Subject: [PATCH 4/7] fix(sys-kernel/coreos-kernel): Fix virtfs+dbus, add PCI
 hotplug.

This adds the following patch: (sent upstream, waiting on response)
  "9p: send uevent after adding/removing mount_tag attribute"

Also enable PCI hotplug to take advantage of more qemu fun! Now
adding/removing virtio devices (which are represented as PCI devices)
at runtime via the qemu monitor console works.
---
 .../coreos-overlay/eclass/cros-kernel/x86_64_defconfig   | 9 +++++++--
 ...l-3.10.5-r1.ebuild => coreos-kernel-3.10.5-r2.ebuild} | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.10.5-r1.ebuild => coreos-kernel-3.10.5-r2.ebuild} (91%)

diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig
index 311e35eef7..dc47feb2a2 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.1 Kernel Configuration
+# Linux/x86 3.10.5 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -552,6 +552,7 @@ CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 CONFIG_PCIE_ECRC=y
 # CONFIG_PCIEAER_INJECT is not set
@@ -576,7 +577,11 @@ CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
-# CONFIG_HOTPLUG_PCI is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_RAPIDIO is not set
 
 #
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild
similarity index 91%
rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild
index f1d2db86e1..26e8e0c371 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $
 
 EAPI=4
-CROS_WORKON_COMMIT="42e65fc40aa591e7a4446a6953e73eecbfbfb954"
+CROS_WORKON_COMMIT="690868ea535f744ddc7bce065b2d566726a3e1c3"
 CROS_WORKON_REPO="git://github.com"
 CROS_WORKON_PROJECT="coreos/linux"
 CROS_WORKON_LOCALNAME="linux"

From 97c799785025583391ac043b4ccf963a2091603b Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 11 Aug 2013 13:55:43 -0400
Subject: [PATCH 5/7] fix(dev-db/etcd): Remove coreos-c10n, it is moving to
 coreos-init

---
 ...d-0.0.1-r5.ebuild => etcd-0.0.1-r6.ebuild} |  0
 .../dev-db/etcd/etcd-0.0.1.ebuild             |  2 -
 .../dev-db/etcd/etcd-99999.ebuild             |  2 -
 .../dev-db/etcd/files/block-until-url         |  7 ----
 .../dev-db/etcd/files/coreos-c10n             | 40 -------------------
 .../dev-db/etcd/files/etcd-bootstrap          |  2 -
 .../dev-db/etcd/files/etcd.service            |  5 +++
 7 files changed, 5 insertions(+), 53 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.0.1-r5.ebuild => etcd-0.0.1-r6.ebuild} (100%)
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/block-until-url
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r6.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r6.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild
index fef8e87cd0..c688066e17 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild
@@ -31,10 +31,8 @@ src_compile() {
 
 src_install() {
 	dobin ${S}/${PN}
-	dobin ${FILESDIR}/coreos-c10n
 	dobin ${FILESDIR}/etcd-bootstrap
 	dobin ${FILESDIR}/etcd-pre-exec
-	dobin ${FILESDIR}/block-until-url
 
 	keepdir /var/lib/${PN}
 	fowners etcd:etcd /var/lib/${PN}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
index 5b5d0051e9..edbdd0b288 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
@@ -30,10 +30,8 @@ src_compile() {
 
 src_install() {
 	dobin ${S}/${PN}
-	dobin ${FILESDIR}/coreos-c10n
 	dobin ${FILESDIR}/etcd-bootstrap
 	dobin ${FILESDIR}/etcd-pre-exec
-	dobin ${FILESDIR}/block-until-url
 
 	keepdir /var/lib/${PN}
 	fowners etcd:etcd /var/lib/${PN}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/block-until-url b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/block-until-url
deleted file mode 100755
index 4a790cc15e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/block-until-url
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-URL="$1"
-
-CMD="curl -s --capath /usr/share/coreos-ca-certificates/ --capath /etc/ssl/certs/ $URL"
-while ($CMD > /dev/null); [ $? -ne 0 ];
-  do sleep .5; done
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n
deleted file mode 100755
index 0c91b65d1c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-VIRT=$(coreos-detect-virt)
-
-if [ "${VIRT}" != "ec2" ]; then
-	# all of this is currently dependent on ec2, we'll refactor as we add more images
-	exit 0
-fi
-
-C10N_ENDPOINT=https://core-api.appspot.com/v1/c10n/group
-META_URL="http://169.254.169.254/latest"
-
-ETCD_BOOTSTRAP="/var/run/etcd/bootstrap.config"
-
-/usr/bin/block-until-url $C10N_ENDPOINT
-/usr/bin/block-until-url $META_URL
-
-USER_DATA=$(curl -s --fail $META_URL/user-data)
-if [ $? -eq 0 ] && [ ! -z "$USER_DATA" ]; then
-        URL=$USER_DATA
-
-        echo $URL | grep -q '^https://' || (echo Coordination URL requires valid SSL; exit 1)
-
-        TMP=`mktemp`
-
-        curl -s "$USER_DATA/raw" > $TMP
-
-        # validate ssh key
-        ssh-keygen -l -f $TMP > /dev/null 2>&1
-        if [ $? -eq 0 ]; then
-                cat $TMP >> /home/core/.ssh/authorized_keys
-                echo "SSH key updated"
-                chown -R core: /home/core/.ssh/
-        else
-                echo "Not a valid ssh key"
-        fi
-fi
-
-IP=$(curl -s $META_URL/meta-data/local-ipv4)
-curl -s $C10N_ENDPOINT -d "c10n_url=$URL" -d"ip_list=$IP" > $ETCD_BOOTSTRAP
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
index a1a5f7d1ee..49f0c1c276 100755
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
@@ -10,8 +10,6 @@ if [ "${VIRT}" != "ec2" ]; then
         exec /usr/bin/etcd -v -d $STATE
 fi
 
-/usr/bin/coreos-c10n
-
 META_URL="http://169.254.169.254/latest"
 MY_IP=$(curl -s $META_URL/meta-data/local-ipv4)
 BOOTSTRAP="/var/run/etcd/bootstrap.config"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
index 728b8609fd..6a65b7eed1 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
@@ -1,3 +1,8 @@
+[Unit]
+Description=etcd
+Wants=coreos-c10n.service
+After=coreos-c10n.service
+
 [Service]
 User=etcd
 PermissionsStartOnly=true

From bab545f35b826d9b62b26b42b36c6e458f484416 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 11 Aug 2013 14:03:00 -0400
Subject: [PATCH 6/7] bump(coreos-base/coreos-init): Update to latest init
 code, includes c10n

Biggest diff here: coreos-init has a Makefile that supports the usual
'install' and 'test' targets so no file copying is required now.
coreos-c10n has moved to init from etcd and has its own service now.
This version of init also includes support for automounting virtfs
filesystems under qemu for use with an updated version of c10n but for
now c10n remains unchanged. Optionally unit tests are available too!
---
 ...13.ebuild => coreos-init-0.0.1-r14.ebuild} |  0
 .../coreos-init/coreos-init-0.0.1.ebuild      | 27 +++++--------------
 .../coreos-init/coreos-init-9999.ebuild       | 25 ++++-------------
 3 files changed, 11 insertions(+), 41 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r13.ebuild => coreos-init-0.0.1-r14.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r14.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r13.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r14.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
index 7adf9af103..9f091f2943 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-CROS_WORKON_COMMIT="38505c2cd170420f0623564794063769a4147aa5"
+CROS_WORKON_COMMIT="84b679b9525db179a3bf78e9e67ab5553d0cc636"
 CROS_WORKON_PROJECT="coreos/init"
 CROS_WORKON_LOCALNAME="init"
 
@@ -16,13 +16,15 @@ SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="nfs"
+IUSE="test"
 
 # Daemons we enable here must installed during build/install in addition to
 # during runtime so the systemd unit enable step works.
 DEPEND="
 	net-misc/dhcpcd
 	net-misc/openssh
+	!<dev-db/etcd-0.0.1-r6
+	test? ( dev-lang/python:2.7 )
 	"
 RDEPEND="${DEPEND}
 	sys-block/parted
@@ -31,25 +33,7 @@ RDEPEND="${DEPEND}
 	"
 
 src_install() {
-	# Install our boot scripts along side systemd in /usr/lib
-	exeinto /usr/lib/coreos
-	for script in scripts/*; do
-		doexe "${script}"
-	done
-
-	# Install our custom ssh config settings.
-	insinto /etc/ssh
-	doins configs/ssh{,d}_config
-	fperms 600 /etc/ssh/sshd_config
-
-	# List of directories that should be recreated as needed
-	insinto /usr/lib/tmpfiles.d
-	newins configs/tmpfiles.conf zz-${PN}.conf
-
-	# Install all units, enable the higher-level services
-	for unit in systemd/*; do
-		systemd_dounit "${unit}"
-	done
+	default
 
 	# Set the default target to multi-user not graphical, this is CoreOS!
 	dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target
@@ -57,6 +41,7 @@ src_install() {
 	systemd_enable_service basic.target coreos-startup.target
 
 	# Services!
+	systemd_enable_service default.target coreos-c10n.service
 	systemd_enable_service default.target local-enable.service
 	systemd_enable_service default.target dhcpcd.service
 	systemd_enable_service default.target sshd-keygen.service
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 35b24ce8b5..d7a5ca7835 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
@@ -15,13 +15,15 @@ SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nfs"
+IUSE="test"
 
 # Daemons we enable here must installed during build/install in addition to
 # during runtime so the systemd unit enable step works.
 DEPEND="
 	net-misc/dhcpcd
 	net-misc/openssh
+	!<dev-db/etcd-0.0.1-r6
+	test? ( dev-lang/python:2.7 )
 	"
 RDEPEND="${DEPEND}
 	sys-block/parted
@@ -30,25 +32,7 @@ RDEPEND="${DEPEND}
 	"
 
 src_install() {
-	# Install our boot scripts along side systemd in /usr/lib
-	exeinto /usr/lib/coreos
-	for script in scripts/*; do
-		doexe "${script}"
-	done
-
-	# Install our custom ssh config settings.
-	insinto /etc/ssh
-	doins configs/ssh{,d}_config
-	fperms 600 /etc/ssh/sshd_config
-
-	# List of directories that should be recreated as needed
-	insinto /usr/lib/tmpfiles.d
-	newins configs/tmpfiles.conf zz-${PN}.conf
-
-	# Install all units, enable the higher-level services
-	for unit in systemd/*; do
-		systemd_dounit "${unit}"
-	done
+	default
 
 	# Set the default target to multi-user not graphical, this is CoreOS!
 	dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target
@@ -56,6 +40,7 @@ src_install() {
 	systemd_enable_service basic.target coreos-startup.target
 
 	# Services!
+	systemd_enable_service default.target coreos-c10n.service
 	systemd_enable_service default.target local-enable.service
 	systemd_enable_service default.target dhcpcd.service
 	systemd_enable_service default.target sshd-keygen.service

From d6203b64c1e878a88da8afd164f88440ed19f2be Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 11 Aug 2013 20:09:19 -0400
Subject: [PATCH 7/7] bump(coreos-base/coreos-init): Replaces oem-services in a
 generic way.

coreos-detect-virt has moved from oem-service and the oem-service unit
has been replaced by new units that work for both oem and virtfs mounts.
---
 ...14.ebuild => coreos-init-0.0.1-r15.ebuild} |  0
 .../coreos-init/coreos-init-0.0.1.ebuild      |  3 ++-
 .../coreos-init/coreos-init-9999.ebuild       |  1 +
 ...1-r201.ebuild => coreos-0.0.1-r202.ebuild} |  0
 .../coreos-base/coreos/coreos-0.0.1.ebuild    |  1 -
 .../oem-service/files/coreos-detect-virt      | 13 ----------
 .../oem-service/files/oem-service.service     |  6 -----
 .../coreos-base/oem-service/files/run-oem.sh  |  6 -----
 .../oem-service/oem-service-0.0.1-r4.ebuild   |  1 -
 .../oem-service/oem-service-0.0.1.ebuild      | 26 -------------------
 10 files changed, 3 insertions(+), 54 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r14.ebuild => coreos-init-0.0.1-r15.ebuild} (100%)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r201.ebuild => coreos-0.0.1-r202.ebuild} (100%)
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/coreos-detect-virt
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/oem-service.service
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/run-oem.sh
 delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1-r4.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r14.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r15.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r14.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r15.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
index 9f091f2943..fa32fb7b2a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-CROS_WORKON_COMMIT="84b679b9525db179a3bf78e9e67ab5553d0cc636"
+CROS_WORKON_COMMIT="4146847b48b7d692f6b8ce50be07c886e7a85fc9"
 CROS_WORKON_PROJECT="coreos/init"
 CROS_WORKON_LOCALNAME="init"
 
@@ -24,6 +24,7 @@ DEPEND="
 	net-misc/dhcpcd
 	net-misc/openssh
 	!<dev-db/etcd-0.0.1-r6
+	!coreos-base/oem-service
 	test? ( dev-lang/python:2.7 )
 	"
 RDEPEND="${DEPEND}
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 d7a5ca7835..4a048fc5c0 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
@@ -23,6 +23,7 @@ DEPEND="
 	net-misc/dhcpcd
 	net-misc/openssh
 	!<dev-db/etcd-0.0.1-r6
+	!coreos-base/oem-service
 	test? ( dev-lang/python:2.7 )
 	"
 RDEPEND="${DEPEND}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r201.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r202.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r201.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r202.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index b6ed2dd69b..b92ec3264b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -149,7 +149,6 @@ RDEPEND="${RDEPEND}
 	app-emulation/docker
 	app-misc/ca-certificates
 	virtual/udev
-	coreos-base/oem-service
 	dev-db/etcd
 	"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/coreos-detect-virt b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/coreos-detect-virt
deleted file mode 100755
index ffa8bfba94..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/coreos-detect-virt
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-OEM_RELEASE="/usr/share/oem/oem-release"
-
-VIRT=
-
-if [ -e "${OEM_RELEASE}" ]; then
-	VIRT=$(cat ${OEM_RELEASE})	
-else
-	VIRT=$(systemd-detect-virt)
-fi
-
-echo $VIRT
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/oem-service.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/oem-service.service
deleted file mode 100644
index 5df18d6e2d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/oem-service.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/run-oem.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/run-oem.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/run-oem.sh
deleted file mode 100755
index 761a1a91ac..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/run-oem.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Each oem implemenation has a run.sh that boostraps its OEM process for systemd
-OEM_EXEC="/usr/share/oem/run.sh"
-
-[ -e $OEM_EXEC ] && exec $OEM_EXEC || exit 0
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1-r4.ebuild
deleted file mode 120000
index 0b9310bc68..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1-r4.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-oem-service-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1.ebuild
deleted file mode 100644
index fba36ecf7a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-# $Header:$
-#
-
-EAPI=2
-inherit systemd
-
-DESCRIPTION="oem service"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_install() {
-	dobin ${FILESDIR}/run-oem.sh
-	dobin ${FILESDIR}/coreos-detect-virt
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_enable_service multi-user.target ${PN}.service
-}