aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2021-06-17 23:58:10 -0700
committerZac Medico <zmedico@gentoo.org>2021-06-17 23:59:17 -0700
commit8e47286b7082aac21fe25402a1f9d03db968cd30 (patch)
treea99a03e63d6734f255a644b64e4be3bf06d4c496
parentRevert "PORTAGE_NICENESS: Consider autogroup scheduling" (diff)
downloadportage-8e47286b.tar.gz
portage-8e47286b.tar.bz2
portage-8e47286b.zip
Revert "pid-ns-init: Carry the autogroup's nice value into the new session"
This reverts commit 209be9a8bee13384dd04a4762436b4c2a5e35bc6 due to another regression. Reported-by: Joonas Niilola <juippis@gentoo.org> Bug: https://bugs.gentoo.org/777492 Bug: https://bugs.gentoo.org/785484 Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--bin/pid-ns-init22
1 files changed, 1 insertions, 21 deletions
diff --git a/bin/pid-ns-init b/bin/pid-ns-init
index c8e82bdb7..e410dd028 100644
--- a/bin/pid-ns-init
+++ b/bin/pid-ns-init
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import errno
@@ -12,7 +12,6 @@ import subprocess
import sys
import termios
-from pathlib import Path
KILL_SIGNALS = (
signal.SIGINT,
@@ -92,28 +91,9 @@ def main(argv):
'preexec_fn': functools.partial(preexec_fn, uid, gid, groups, umask),
'pass_fds': pass_fds,
}
-
- # Try to obtain the current autogroup's nice value.
- autogroup_nice = None
- autogroup_file = Path("/proc/self/autogroup")
- try:
- f = autogroup_file.open("r")
- except EnvironmentError:
- pass
- else:
- with f:
- line = f.readline()
- autogroup_nice = line.split(" ")[2]
-
# Isolate parent process from process group SIGSTOP (bug 675870)
setsid = True
os.setsid()
-
- if autogroup_nice:
- # Set the previously obtained autogroup nice value again,
- # since we created a new session with os.setsid() above.
- autogroup_file.write_text(autogroup_nice)
-
if sys.stdout.isatty():
try:
fcntl.ioctl(sys.stdout, termios.TIOCSCTTY, 0)