emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always attempt to mount /dev/pts when devpts is available as it may appear in some 2.4 setups.

Browse Source
This commit is contained in:
Mike Frysinger 2007-09-03 03:10:42 +00:00
parent 2a1e0c1d8d
commit a166958537
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,11 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts # ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
02 Sep 2007; Mike Frysinger <vapier@gentoo.org>:
Always attempt to mount /dev/pts when devpts is available as it may appear
in some 2.4 setups.
* baselayout-2.0.0_rc4 (02 Sep 2007) * baselayout-2.0.0_rc4 (02 Sep 2007)
02 Sep 2007; Roy Marples <uberlord@gentoo.org>: 02 Sep 2007; Roy Marples <uberlord@gentoo.org>:

30
sh.Linux/init.sh
View File

@ -197,23 +197,21 @@ else
done done
fi fi
# From linux-2.6 we need to mount /dev/pts again ... # Mount the new fancy pants /dev/pts whenever possible
if [ "${RC_UNAME}" != "GNU/kFreeBSD" -a "${K26}" = "0" ] ; then if grep -Eq "[[:space:]]+devpts$" /proc/filesystems && \
if grep -Eq "[[:space:]]+devpts$" /proc/filesystems && \ ! mountinfo /dev/pts > /dev/null ; then
! mountinfo /dev/pts > /dev/null ; then if [ ! -d /dev/pts ] && \
if [ ! -d /dev/pts ] && \ [ "${devfs}" = "yes" -o "${udev}" = "yes" ] ; then
[ "${devfs}" = "yes" -o "${udev}" = "yes" ] ; then # Make sure we have /dev/pts
# Make sure we have /dev/pts mkdir -p /dev/pts >/dev/null 2>/dev/null || \
mkdir -p /dev/pts >/dev/null 2>/dev/null || \ ewarn "Could not create /dev/pts!"
ewarn "Could not create /dev/pts!" fi
fi
if [ -d /dev/pts ] ; then if [ -d /dev/pts ] ; then
ebegin "Mounting devpts at /dev/pts" ebegin "Mounting devpts at /dev/pts"
mntcmd="$(fstabinfo --mountcmd /dev/pts)" mntcmd="$(fstabinfo --mountcmd /dev/pts)"
try mount -n ${mntcmd:--t devpts -o gid=5,mode=0620,noexec,nosuid devpts /dev/pts} try mount -n ${mntcmd:--t devpts -o gid=5,mode=0620,noexec,nosuid devpts /dev/pts}
eend $? eend $?
fi
fi fi
fi fi