lxc-netstat: 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 <ncopa@alpinelinux.org> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-netstat: improve finding fs mountpoint of hierarchy
f358385a · Natanael Copa · Stéphane Graber · f3849d01 · f358385a
Commit f358385a authored Dec 26, 2012 by Natanael Copa Committed by Stéphane Graber Jan 02, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

lxc-netstat.in src/lxc/lxc-netstat.in +2 -1

No files found.
--- a/src/lxc/lxc-netstat.in
+++ b/src/lxc/lxc-netstat.in
@@ -51,7 +51,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