diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-06-14 23:29:04 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-06-14 23:29:04 +0000 |
| commit | 3f8973504ff21d314340da2ffaa7de2616ff8d87 (patch) | |
| tree | 90c59372235a0aefacb9c9428d8adfb9f151e296 /sys-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-3f8973504ff21d314340da2ffaa7de2616ff8d87.tar.gz gentoo-2-3f8973504ff21d314340da2ffaa7de2616ff8d87.tar.bz2 gentoo-2-3f8973504ff21d314340da2ffaa7de2616ff8d87.zip | |
Do not die when the devpts check fails and we are on an old kernel #489520 by William Throwe.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/pkg_preinst.eblit | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index d00d557ce5fe..9de315f3ec9f 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.995 2014/06/14 22:24:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.996 2014/06/14 23:29:04 vapier Exp $ + + 14 Jun 2014; Mike Frysinger <vapier@gentoo.org> + files/eblits/pkg_preinst.eblit: + Do not die when the devpts check fails and we are on an old kernel #489520 by + William Throwe. 14 Jun 2014; Mike Frysinger <vapier@gentoo.org> metadata.xml: Add upstream CPE tag (security info). diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit index b54487d19642..00041e75c65f 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-2013 Gentoo Foundation +# Copyright 1999-2014 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.11 2013/06/29 03:22:32 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.12 2014/06/14 23:29:04 vapier Exp $ # Simple test to make sure our new glibc isnt completely broken. # Make sure we don't test with statically built binaries since @@ -54,7 +54,10 @@ eblit-glibc-pkg_preinst() { eerror "you have devpts mounted at /dev/pts with the gid=5 option." eerror "Openrc should do this for you, so you should check /etc/fstab" eerror "and make sure you do not have any invalid settings there." - die "mount & fix your /dev/pts settings" + # Do not die on older kernels as devpts did not export these settings #489520. + if version_is_at_least 2.6.25 $(uname -r) ; then + die "mount & fix your /dev/pts settings" + fi fi fi } |