summaryrefslogtreecommitdiff
path: root/src/librc/librc.c
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2011-01-05 22:06:42 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2011-01-05 22:09:34 -0800
commit3d4d1ab14bb6500c9811e574b1717bb57c6095f8 (patch)
tree7935acebf15fe0eeed58801b3a27713a619c4a7a /src/librc/librc.c
parent09f990a7c835d75f67cfe696a35e8c46e67c612f (diff)
downloadopenrc-3d4d1ab14bb6500c9811e574b1717bb57c6095f8.tar.gz
openrc-3d4d1ab14bb6500c9811e574b1717bb57c6095f8.tar.bz2
openrc-3d4d1ab14bb6500c9811e574b1717bb57c6095f8.tar.xz
Remove broken automatic LXC subsystem detection.
Any system using cgroups was being detected as an LXC system. This was triggering on OpenVZ under RHEL6 as well as the "automated per tty task groups" as discussed on the LKML. All LXC users should now switch to the new rc_sys variable introduced in the previous patch. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'src/librc/librc.c')
-rw-r--r--src/librc/librc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/librc/librc.c b/src/librc/librc.c
index 6d82343..868accd 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -277,8 +277,6 @@ rc_sys_v1(void)
return RC_SYS_VSERVER;
else if (exists("/proc/vz/veinfo") && !exists("/proc/vz/version"))
return RC_SYS_OPENVZ;
- else if (file_regex("/proc/self/cgroup", ":/.+$"))
- return RC_SYS_LXC;
else if (file_regex("/proc/self/status",
"envID:[[:space:]]*[1-9]"))
return RC_SYS_OPENVZ; /* old test */