From a162b17905cd4809152f9292f65befbefc855fc2 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sat, 16 Feb 2013 10:46:45 -0800 Subject: [PATCH] hack(coreos-base/chromeos-base): comment out file changes that conflict these file changes conflict with other packages. Fix them up later. --- .../coreos-base/chromeos-base/chromeos-base-0.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-base/chromeos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-base/chromeos-base-0.ebuild index 8502d64554..e8d7612a5e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-base/chromeos-base-0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-base/chromeos-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 @@ -114,7 +114,7 @@ src_install() { 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 @@ -122,9 +122,9 @@ src_install() { 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