From 485f519a518b065a6a511c6b89bb6a9f7f039e39 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 29 Nov 2013 19:54:23 -0800 Subject: [PATCH] fix(coreos-base/coreos-base): Remove nsswitch.conf Provided by glibc now that it is being installed properly. --- ...-0-r69.ebuild => coreos-base-0-r70.ebuild} | 0 .../coreos-base/coreos-base-0.ebuild | 3 --- .../coreos-base/files/nsswitch.conf | 24 ------------------- 3 files changed, 27 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/{coreos-base-0-r69.ebuild => coreos-base-0-r70.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/nsswitch.conf diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r69.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r70.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r69.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r70.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 c8d3a6d94e..da6aa9933a 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 @@ -122,9 +122,6 @@ src_install() { # Insert empty fstab doins "${FILESDIR}"/fstab - # 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 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/nsswitch.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/nsswitch.conf deleted file mode 100644 index 4259b8a468..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/nsswitch.conf +++ /dev/null @@ -1,24 +0,0 @@ -# /etc/nsswitch.conf: -# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nsswitch.conf,v 1.1 2006/09/29 23:52:23 vapier Exp $ - -passwd: compat -shadow: compat -group: compat - -# passwd: db files nis -# shadow: db files nis -# group: db files nis - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files