From f9e96ee1583b1d0fc39936b62f68c17a1be635e6 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Tue, 5 Feb 2013 17:15:19 -0800
Subject: [PATCH] fix(coreos-base): remove conflicts with base layout

Detected file collision(s):

	/etc/sysctl.conf
	/etc/ssh/sshd_config
	/etc/ssh/ssh_config
	/bin/sh
	/usr/libexec/pager
	/usr/libexec/editor
	/usr/bin/awk
---
 .../coreos-base/coreos-base-0.ebuild           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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 a97e6c6160..d47728d9da 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
@@ -94,7 +94,7 @@ pkg_setup() {
 
 src_install() {
 	insinto /etc
-	doins "${FILESDIR}"/sysctl.conf || die
+	#doins "${FILESDIR}"/sysctl.conf || die
 
 	insinto /etc/profile.d
 	doins "${FILESDIR}"/xauthority.sh || die
@@ -111,20 +111,20 @@ src_install() {
 		dosym /var/lib/timezone/localtime /etc/localtime || die
 
 		# We use mawk in the target boards, not gawk.
-		dosym mawk /usr/bin/awk || die
+		#dosym mawk /usr/bin/awk || die
 
 		# We want dash as our main shell.
-		dosym dash /bin/sh
+		#dosym dash /bin/sh
 
 		# Avoid the wrapper and just link to the only editor we have.
-		dodir /usr/libexec
-		dosym /usr/bin/vim /usr/libexec/editor || die
-		dosym /bin/more /usr/libexec/pager || die
+		#dodir /usr/libexec
+		#dosym /usr/bin/vim /usr/libexec/editor || die
+		#dosym /bin/more /usr/libexec/pager || die
 
 		# Install our custom ssh config settings.
-		insinto /etc/ssh
-		doins "${FILESDIR}"/ssh{,d}_config
-		fperms 600 /etc/ssh/sshd_config
+		#insinto /etc/ssh
+		#doins "${FILESDIR}"/ssh{,d}_config
+		#fperms 600 /etc/ssh/sshd_config
 
 		# Custom login shell snippets.
 		insinto /etc/profile.d