shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

Revert "util: Fine tune running_in_chroot() a bit" (#5506)

Browse Source 
This reverts commit 295ee9845c801300298d01256eb5a9e3ff117ae0.

Let'd revert this for now, see #5446 for discussions.

We want systemd-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.
This commit is contained in:
Lennart Poettering 2017-03-01 21:22:02 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent b7a09e35cc
commit d6d0473dc9
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/basic/virt.c
View File

@ -28,7 +28,6 @@
#include "env-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
#include "macro.h"
#include "process-util.h"
#include "stat-util.h"
@ -570,30 +569,16 @@ int running_in_userns(void) {
}
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 (getenv_bool("SYSTEMD_IGNORE_CHROOT") > 0)
return 0;
r = files_same("/proc/1/root", "/");
if (r < 0)
return r;
if (r > 0)
return 0;
ret = files_same("/proc/1/root", "/");
if (ret < 0)
return ret;
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;
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] = {