vapier      14/06/14 23:29:04

  Modified:             pkg_preinst.eblit
  Log:
  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)

Revision  Changes    Path
1.12                 sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.11&r2=1.12

Index: pkg_preinst.eblit
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pkg_preinst.eblit   29 Jun 2013 03:22:32 -0000      1.11
+++ pkg_preinst.eblit   14 Jun 2014 23:29:04 -0000      1.12
@@ -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 @@
                        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
 }




Reply via email to