[lxc-devel] [PATCH] Remove wrong command line arg from help output

[Serge Hallyn]

Quoting Christian Brauner (christian.brauner at mailbox.org):
> Signed-off-by: Christian Brauner <christian.brauner at mailbox.org>

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

> ---
> Slipped my attention before unfortunately.
> ---
>  src/lxc/lxc_ls.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/src/lxc/lxc_ls.c b/src/lxc/lxc_ls.c
> index b7034dc..aae2512 100644
> --- a/src/lxc/lxc_ls.c
> +++ b/src/lxc/lxc_ls.c
> @@ -28,13 +28,14 @@
>  #include <sys/ioctl.h>
>  #include <sys/stat.h>
>  
> +#include <lxc/lxccontainer.h>
> +
>  #include "arguments.h"
>  #include "conf.h"
>  #include "config.h"
>  #include "confile.h"
>  #include "log.h"
>  #include "lxc.h"
> -#include "lxccontainer.h"
>  #include "utils.h"
>  
>  lxc_log_define(lxc_ls, lxc);
> @@ -172,9 +173,9 @@ static const struct option my_longopts[] = {
>  static struct lxc_arguments my_args = {
>  	.progname = "lxc-ls",
>  	.help = "\n\
> -[-P lxcpath] [--active] [--running] [--frozen] [--stopped] [--nesting] [-g groups] [-r regex]\n\
> -[-1] [-P lxcpath] [--active] [--running] [--frozen] [--stopped] [--nesting] [-g groups] [-r regex]\n\
> -[-f] [-P lxcpath] [--active] [--running] [--frozen] [--stopped] [--nesting] [-g groups] [-r regex]\n\
> +[-P lxcpath] [--active] [--running] [--frozen] [--stopped] [--nesting] [-g groups] [--filter regex]\n\
> +[-1] [-P lxcpath] [--active] [--running] [--frozen] [--stopped] [--nesting] [-g groups] [--filter regex]\n\
> +[-f] [-P lxcpath] [--active] [--running] [--frozen] [--stopped] [--nesting] [-g groups] [--filter regex]\n\
>  \n\
>  lxc-ls list containers\n\
>  \n\
> @@ -187,7 +188,7 @@ Options :\n\
>    --frozen           list only frozen containers\n\
>    --stopped          list only stopped containers\n\
>    --nesting=NUM      list nested containers up to NUM (default is 5) levels of nesting\n\
> -  -r --regex         filter container names by regular expression\n\
> +  --filter=REGEX     filter container names by regular expression\n\
>    -g --groups        comma separated list of groups a container must have to be displayed\n",
>  	.options = my_longopts,
>  	.parser = my_parser,
> -- 
> 2.7.0
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel