From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 Mar 2012 23:43:47 +0000 (+0100)
Subject: virt: the pidns controller does not exist anymore
X-Git-Tag: v44~24
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fb0864e7b9c6d26269ccea6ec5c0fd921c029781

virt: the pidns controller does not exist anymore
---

diff --git a/TODO b/TODO
index dece0553c..4936fdeea 100644
--- a/TODO
+++ b/TODO
@@ -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
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index eecff7373..3cc126b12 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -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
diff --git a/src/virt.c b/src/virt.c
index 3f0912a8a..4c526ff45 100644
--- a/src/virt.c
+++ b/src/virt.c
@@ -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;
 }