summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-10-02 07:12:17 +0000
committerMike Frysinger <vapier@gentoo.org>2012-10-02 07:12:17 +0000
commit7f1a6a57094e14ad5c471cea8882940b76e01f1f (patch)
treea14504c107b09b68dff76792b57226fc38de6af5
parentRe-enable NaCl. Build with system speex (bug #432748 by floppym). Remove old. (diff)
downloadgentoo-2-7f1a6a57094e14ad5c471cea8882940b76e01f1f.tar.gz
gentoo-2-7f1a6a57094e14ad5c471cea8882940b76e01f1f.tar.bz2
gentoo-2-7f1a6a57094e14ad5c471cea8882940b76e01f1f.zip
Default host.conf:multi to on when /etc/hosts is small #436530 by Eray Aslan.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
-rw-r--r--sys-libs/glibc/ChangeLog6
-rw-r--r--sys-libs/glibc/files/eblits/pkg_preinst.eblit8
2 files changed, 12 insertions, 2 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 108989db7d8a..005c582e7e4e 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,9 @@
# ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.894 2012/10/02 04:58:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.895 2012/10/02 07:12:17 vapier Exp $
+
+ 02 Oct 2012; Mike Frysinger <vapier@gentoo.org>
+ files/eblits/pkg_preinst.eblit:
+ Default host.conf:multi to on when /etc/hosts is small #436530 by Eray Aslan.
02 Oct 2012; Mike Frysinger <vapier@gentoo.org>
files/eblits/pkg_preinst.eblit:
diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index ec87806699ad..bb1032ddcb03 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.5 2012/10/02 04:58:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.6 2012/10/02 07:12:17 vapier Exp $
eblit-glibc-pkg_preinst() {
# nothing to do if just installing headers
@@ -9,6 +9,12 @@ eblit-glibc-pkg_preinst() {
# prepare /etc/ld.so.conf.d/ for files
mkdir -p "${ROOT}"/etc/ld.so.conf.d
+ # Default /etc/hosts.conf:multi to on for systems with small dbs.
+ if [[ $(wc -l < "${ROOT}"/etc/hosts) -lt 1000 ]] ; then
+ sed -i '/^multi off/s:off:on:' "${D}"/etc/host.conf
+ elog "Defaulting /etc/host.conf:multi to on"
+ fi
+
# simple test to make sure our new glibc isnt completely broken.
# make sure we don't test with statically built binaries since
# they will fail. also, skip if this glibc is a cross compiler.