From: Natanael Copa Date: Wed, 26 Dec 2012 09:07:04 +0000 (+0100) Subject: legacy/lxc-ls: improve finding fs mountpoint of hierarchy X-Git-Tag: lxc-0.9.0.alpha3~1^2~91 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32e869018640e0d898031de20514e0ffca79baa9;p=thirdparty%2Flxc.git legacy/lxc-ls: improve finding fs mountpoint of hierarchy We cannot assume that the mount source name always starts with 'cgroup' so we check the filesystem type instead. Use 'awk' instead of 'grep -E' and as it is a better tool for this job. This fixes the tool on systems using openrc. Signed-off-by: Natanael Copa Acked-by: Stéphane Graber --- diff --git a/src/lxc/legacy/lxc-ls.in b/src/lxc/legacy/lxc-ls.in index 6757f27bf..7a298c62d 100644 --- a/src/lxc/legacy/lxc-ls.in +++ b/src/lxc/legacy/lxc-ls.in @@ -54,7 +54,8 @@ 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=$(awk -v subsysregex="(^|,)$subsystems(,|\$)" \ + '$3 == "cgroup" && $4 ~ subsysregex {print $2}' /proc/self/mounts) if [ -z "$mountpoint" ]; then continue; fi # Return the absolute path to the containers' parent cgroup