28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
|
From c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Thu, 14 Mar 2013 20:36:38 +0000
|
||
|
|
Subject: main: don't mount /sys, /dev and friends when we run with PID != 1
|
||
|
|
|
||
|
|
Back from old times when we developed systemd on non-systemd hosts we
|
||
|
|
still mounted the missing directories such as the cgroup stuff even when
|
||
|
|
running with a PID != 1. There's no point for that anymore, so let's
|
||
|
|
just do that if we are actually PID 1, and never otherwise.
|
||
|
|
|
||
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=62354
|
||
|
|
---
|
||
|
|
diff --git a/src/core/main.c b/src/core/main.c
|
||
|
|
index 7b03983..01a6d41 100644
|
||
|
|
--- src/core/main.c
|
||
|
|
+++ src/core/main.c
|
||
|
|
@@ -1437,7 +1437,7 @@ int main(int argc, char *argv[]) {
|
||
|
|
|
||
|
|
/* Mount /proc, /sys and friends, so that /proc/cmdline and
|
||
|
|
* /proc/$PID/fd is available. */
|
||
|
|
- if (geteuid() == 0 && !getenv("SYSTEMD_SKIP_API_MOUNTS")) {
|
||
|
|
+ if (getpid() == 1) {
|
||
|
|
r = mount_setup(loaded_policy);
|
||
|
|
if (r < 0)
|
||
|
|
goto finish;
|
||
|
|
--
|
||
|
|
cgit v0.9.0.2-2-gbebe
|