Fix permissions of /dev/pts (bug #375947)

diff --git a/ChangeLog b/ChangeLog
index 1402b9fd1639c9b412ba9dfd5e421e170a0c4000..b11433ac1f978ff9a4d3f580253a31bfc180b752 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  23 Jul 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+  netboot/linuxrc.x:
+  Fix permissions of /dev/pts (bug #375947)
+
   20 Jul 2011; Fabio Erculiani <lxnay@sabayon.org> defaults/config.sh,
   doc/genkernel.8.txt, gen_cmdline.sh, gen_compile.sh:
   Make possible to compile XEN based kernels providing --kernel-target= and

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b908ba052e896d5f90b2ddad4c8197ccb956d165..b71d30ae8a7f5fad8a25949f8400d3c2ea1140de 100755 (executable)
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -319,8 +319,8 @@ runmdev() {
                || bad_msg "Failed to mount /dev as ${devfs}"
 
        # http://git.busybox.net/busybox/plain/docs/mdev.txt
-       mkdir /dev/pts
-       mount -t devpts devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
+       mkdir -m 0755 /dev/pts
+       mount -t devpts -o gid=5,mode=0620 devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
        mdev -s  || bad_msg "Failed to receive dynamic updates from mdev"
 }
 

diff --git a/netboot/linuxrc.x b/netboot/linuxrc.x
old mode 100755 (executable)
new mode 100644 (file)
index dc4a9bf..3e46859
--- a/netboot/linuxrc.x
+++ b/netboot/linuxrc.x
@@ -1,6 +1,6 @@
 #!/bin/ash
 
-# Copyright 2001-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 export PATH="/usr/sbin:/usr/bin:/sbin:/bin"
@@ -37,7 +37,7 @@ StartUp() {
                /bin/busybox --install -s
 
                #// Create additional mount points
-               mkdir           /dev/pts
+               mkdir -m 0755 /dev/pts
                mkdir           /dev/shm
                mkdir -p        /mnt/cdrom
                mkdir           /mnt/floppy
@@ -46,7 +46,7 @@ StartUp() {
 
                #// Mount remaining filesystems
                mount tmp       /tmp            -t tmpfs                # /tmp
-               mount devpts    /dev/pts        -t devpts               # /dev/pts
+               mount devpts    /dev/pts        -t devpts -o gid=5,mode=0620    # /dev/pts
                mount shm       /dev/shm        -t tmpfs -o size=512k   # /dev/shm
 
                #// Create mtab