Commit fb0864e7 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

virt: the pidns controller does not exist anymore

parent 67aa4551
......@@ -18,6 +18,14 @@ Bugfixes:
Features:
* Add ConditionReadWriteFileSystem= so that systemd-sysctl doesn't get executed when /proc/sys is read-only
* unset container= and container_uuid= for child processes
* when bind mounting /etc/machine-id, do so from /run/machine-id
* introduce mix of BindTo and Requisite
* journalctl: show multiline log messages sanely, expand tabs, and show all valid utf8 messages
* introduce NeedsMounts= or so to create .mount dependencies automatically for a specific path
......
......@@ -780,8 +780,7 @@
<varname>openvz</varname>,
<varname>lxc</varname>,
<varname>lxc-libvirt</varname>,
<varname>systemd-nspawn</varname>,
<varname>pidns</varname> to test
<varname>systemd-nspawn</varname> to test
against a specific implementation. If
multiple virtualization technologies
are nested only the innermost is
......
......@@ -236,35 +236,6 @@ int detect_container(const char **id) {
fclose(f);
}
f = fopen("/proc/self/cgroup", "re");
if (f) {
for (;;) {
char line[LINE_MAX], *p;
if (!fgets(line, sizeof(line), f))
break;
p = strchr(strstrip(line), ':');
if (!p)
continue;
if (strncmp(p, ":ns:", 4))
continue;
if (!streq(p, ":ns:/")) {
fclose(f);
if (id)
*id = "pidns";
return 1;
}
}
fclose(f);
}
return 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment