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)

1 files changed, 6 insertions, 3 deletions

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
 }