mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-23 15:31:05 +02:00
Merge pull request #1705 from marineam/devpts
glibc: Do not check /dev/pts options
This commit is contained in:
commit
bfa49f1871
@ -46,30 +46,8 @@ glibc_run_test() {
|
||||
}
|
||||
|
||||
check_devpts() {
|
||||
# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
|
||||
|
||||
# If merely building the binary package, then there's nothing to verify.
|
||||
[[ ${MERGE_TYPE} == "buildonly" ]] && return
|
||||
|
||||
# Only sanity check when installing the native glibc.
|
||||
[[ ${ROOT} != "/" ]] && return
|
||||
|
||||
# Older versions always installed setuid, so no need to check.
|
||||
in_iuse suid || return
|
||||
|
||||
# If they're opting in to the old suid code, then no need to check.
|
||||
use suid && return
|
||||
|
||||
if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
|
||||
eerror "In order to use glibc with USE=-suid, you must make sure that"
|
||||
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."
|
||||
# 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
|
||||
## COREOS: Ignore /dev/pts settings, the chroot has no control over them.
|
||||
return 0
|
||||
}
|
||||
|
||||
eblit-glibc-pkg_pretend() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user