On 12-09-24 05:21 AM, Christian Seiler wrote: > 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 <christ...@iwakd.de> > Cc: Serge Hallyn <serge.hal...@ubuntu.com> > --- > src/lxc/lxc-ls.in | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/src/lxc/lxc-ls.in b/src/lxc/lxc-ls.in > index 4b9dc77..9293323 100644 > --- 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 >
Sounds reasonable. I'll push to staging later today. Thanks -- Stéphane Graber Ubuntu developer http://www.ubuntu.com
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel