Portage itself does not need /run to be mounted. build-docbook-catalog was adjusted to create locks in /etc/xml instead.
Bug: https://bugs.gentoo.org/832853 Closes: https://github.com/gentoo/portage/pull/788 Reverts: 0e9e12aadb889766d61c0561b9723e71542d43e6 Signed-off-by: Mike Gilbert <flop...@gentoo.org> --- lib/_emerge/actions.py | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py index 0255e3e97..f82069f9a 100644 --- a/lib/_emerge/actions.py +++ b/lib/_emerge/actions.py @@ -3020,25 +3020,17 @@ def validate_ebuild_environment(trees): check_locale() -def check_mounted_fs(): - """We need /proc for finding CPU counts and finding other system information. - We need /run for e.g. lock files in ebuilds.""" - paths = {"/proc": False, "/run": False} - - for path in paths.keys(): - if platform.system() not in ("Linux",) or os.path.ismount(path): - paths[path] = True - continue - - msg = "It seems %s is not mounted. Process management may malfunction." % path - writemsg_level( - "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)), - level=logging.ERROR, - noiselevel=-1, - ) - - # Were all of the mounts we were looking for available? - return all(paths.values()) +def check_procfs(): + procfs_path = "/proc" + if platform.system() not in ("Linux",) or os.path.ismount(procfs_path): + return os.EX_OK + msg = "It seems that %s is not mounted. You have been warned." % procfs_path + writemsg_level( + "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)), + level=logging.ERROR, + noiselevel=-1, + ) + return 1 def config_protect_check(trees): @@ -3516,8 +3508,7 @@ def run_action(emerge_config): repo_name_check(emerge_config.trees) repo_name_duplicate_check(emerge_config.trees) config_protect_check(emerge_config.trees) - - check_mounted_fs() + check_procfs() for mytrees in emerge_config.trees.values(): mydb = mytrees["porttree"].dbapi -- 2.35.1
