lxc-ls: Scan cgroup mount points from fstype and not device

lxc-ls --active now scans mount points that have the 'cgroup' filesystem type and not the 'cgroup' device name (which is ignored anyway and may be anything). Signed-off-by: Christian Seiler <christian@iwakd.de> Cc: Serge Hallyn <serge.hallyn@ubuntu.com>

lxc-ls: Scan cgroup mount points from fstype and not device
3b9bad3d · Christian Seiler · Stéphane Graber · c12e7752 · 3b9bad3d
Commit 3b9bad3d authored Sep 24, 2012 by Christian Seiler Committed by Stéphane Graber Oct 25, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lxc-ls.in src/lxc/lxc-ls.in +1 -1

No files found.
--- a/src/lxc/lxc-ls.in
+++ b/src/lxc/lxc-ls.in
@@ -56,7 +56,7 @@ get_parent_cgroup()
 		init_cgroup=${fields#*:}

 		# Get the filesystem mountpoint of the hierarchy
-		mountpoint=$(grep -E "^cgroup [^ ]+ [^ ]+ ([^ ]+,)?$subsystems(,[^ ]+)? " /proc/self/mounts | cut -d ' ' -f 2)
+		mountpoint=$(grep -E "^[^ ]+ [^ ]+ cgroup ([^ ]+,)?$subsystems(,[^ ]+)? " /proc/self/mounts | cut -d ' ' -f 2)
 		if [ -z "$mountpoint" ]; then continue; fi

 		# Return the absolute path to the containers' parent cgroup