diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-05-28 18:37:11 +0800 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-05-28 18:53:44 +0800 |
| commit | fdd25311706bd32580ec4d43211cdf4665d2f9de (patch) | |
| tree | 37f3d1859779e00321ac69882b40723d5c875531 /configure.ac | |
| parent | d2edfae0f9bdbecf6a8518e2a5bcf06f470e0d9e (diff) | |
| download | systemd-fdd25311706bd32580ec4d43211cdf4665d2f9de.tar.gz | |
virt: rework container detection logic
Instead of accessing /proc/1/environ directly, trying to read the
$container variable from it, let's make PID 1 save the contents of that
variable to /run/systemd/container. This allows us to detect containers
without the need for CAP_SYS_PTRACE, which allows us to drop it from a
number of daemons and from the file capabilities of systemd-detect-virt.
Also, don't consider chroot a container technology anymore. After all,
we don't consider file system namespaces container technology anymore,
and hence chroot() should be considered a container even less.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index e5883e7752..be57e82cbc 100644 --- a/configure.ac +++ b/configure.ac @@ -68,8 +68,6 @@ AC_PATH_PROG([XSLTPROC], [xsltproc]) AC_PATH_PROG([QUOTAON], [quotaon], [/usr/sbin/quotaon], [$PATH:/usr/sbin:/sbin]) AC_PATH_PROG([QUOTACHECK], [quotacheck], [/usr/sbin/quotacheck], [$PATH:/usr/sbin:/sbin]) -AC_PATH_PROG([SETCAP], [setcap], [/usr/sbin/setcap], [$PATH:/usr/sbin:/sbin]) - AC_PATH_PROG([KILL], [kill], [/usr/bin/kill], [$PATH:/usr/sbin:/sbin]) AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin]) |