[lxc-devel] [PATCH] lxc-ps: fix the display problem with arg --lxc

[Serge Hallyn]

Quoting Weng Meiling (wengmeiling.weng at huawei.com):
> On 2013/6/5 1:32, Serge Hallyn wrote:
> > Quoting Weng Meiling (wengmeiling.weng at huawei.com):
> >> When we use arg --lxc to show processes in all containers, no
> >> process displays, so fix it.
> >>
> >> Signed-off-by: Weng Meiling <wengmeiling.weng at huawei.com>
> >> ---
> >>  src/lxc/lxc-ps.in | 14 +++++++-------
> >>  1 file changed, 7 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/src/lxc/lxc-ps.in b/src/lxc/lxc-ps.in
> >> index 29e8097..7e08a71 100644
> >> --- a/src/lxc/lxc-ps.in
> >> +++ b/src/lxc/lxc-ps.in
> >> @@ -39,9 +39,10 @@ help() {
> >>
> >>  get_parent_cgroup()
> >>  {
> >> -    local hierarchies hierarchy fields subsystems init_cgroup mountpoint
> >> +    local hierarchies hierarchy fields init_cgroup mountpoint
> >>
> >>      parent_cgroup=""
> >> +    subsystems=""
> >>
> >>      # Obtain a list of hierarchies that contain one or more subsystems
> >>      hierarchies=$(tail -n +2 /proc/cgroups | cut -f 2)
> >> @@ -65,11 +66,7 @@ get_parent_cgroup()
> >>          if [ -z "$mountpoint" ]; then continue; fi
> >>
> >>          # Return the absolute path to the containers' parent cgroup
> >> -        # (do not append '/lxc' if the hierarchy contains the 'ns' subsystem)
> >> -        case ",$subsystems," in
> >> -            *,ns,*) parent_cgroup="${mountpoint}${init_cgroup%/}";;
> >> -            *) parent_cgroup="${mountpoint}${init_cgroup%/}";;
> >> -        esac
> >> +        parent_cgroup="${mountpoint}${init_cgroup%/}";;
> > 
> > Hi,
> > 
> > at the very least having ';;' here breaks.  Replacing that with one ';'
> > does seem to fix lxc-ps.  But I worry that this means your patch may
> > not be what you intended.  Could you please double-check?
> > 
> yes, I'm sorry for this. I'll be more carefull.

Thanks - just wanted to make sure this didn't mean there might be other
missing hunks in the sent patch.  I've attached wrong files before...

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

and pushed to staging, thanks.

-serge