From 3d4d1ab14bb6500c9811e574b1717bb57c6095f8 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Wed, 5 Jan 2011 22:06:42 -0800 Subject: 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 --- src/librc/librc.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/librc/librc.c') 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 */ -- cgit v1.2.3