diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-03-01 21:22:02 +0100 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 17:58:36 +0200 |
commit | e7082c89f1eac3ee251e659ee004f4d29fc284a6 (patch) | |
tree | a8cabdd84ab6039caf39f4528a8b735ea4107842 | |
parent | 897fa0c6abbc3ca06bbde9ec9f53f07ae24d8eba (diff) |
Revert "util: Fine tune running_in_chroot() a bit" (#5506)
This reverts commit 295ee9845c801300298d01256eb5a9e3ff117ae0.
Let'd revert this for now, see #5446 for discussions.
We want elogind-detect-virt --chroot to return true for all chroot-like stuff, for
example mock environments which have use a mount namespace. The downside
of this revert that systemctl will not work from our own namespaced services, anything
with RootDirectory=/RootImage= set.
-rw-r--r-- | src/basic/virt.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/basic/virt.c b/src/basic/virt.c index 276df8352..9ea18e63f 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -572,32 +572,18 @@ int running_in_userns(void) { #endif // 0 int running_in_chroot(void) { - _cleanup_free_ char *self_mnt = NULL, *pid1_mnt = NULL; - int r; - - /* Try to detect whether we are running in a chroot() environment. Specifically, check whether we have a - * different root directory than PID 1, even though we live in the same mount namespace as it. */ + int ret; #if 0 /// elogind does not allow to ignore chroots, we are never init! if (getenv_bool("SYSTEMD_IGNORE_CHROOT") > 0) return 0; #endif // 0 - r = files_same("/proc/1/root", "/"); - if (r < 0) - return r; - if (r > 0) - return 0; - - r = readlink_malloc("/proc/self/ns/mnt", &self_mnt); - if (r < 0) - return r; - - r = readlink_malloc("/proc/1/ns/mnt", &pid1_mnt); - if (r < 0) - return r; + ret = files_same("/proc/1/root", "/"); + if (ret < 0) + return ret; - return streq(self_mnt, pid1_mnt); /* Only if we live in the same namespace! */ + return ret == 0; } static const char *const virtualization_table[_VIRTUALIZATION_MAX] = { |