Quoting Dwight Engen (dwight.en...@oracle.com):
> Signed-off-by: Dwight Engen <dwight.en...@oracle.com>
Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com>
> ---
> doc/lxc-monitor.sgml.in | 13 ++++++++-----
> src/lxc/lxc_monitor.c | 3 ++-
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
> index a0aa7df..abd668a 100644
> --- a/doc/lxc-monitor.sgml.in
> +++ b/doc/lxc-monitor.sgml.in
> @@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> MA 02110-1301 USA
> <refsynopsisdiv>
> <cmdsynopsis>
> <command>lxc-monitor</command>
> - <arg choice="req">-n <replaceable>name</replaceable></arg>
> + <arg choice="opt">-n <replaceable>name</replaceable></arg>
> </cmdsynopsis>
> </refsynopsisdiv>
>
> @@ -57,10 +57,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
> Boston, MA 02110-1301 USA
> <title>Description</title>
>
> <para>
> - <command>lxc-monitor</command> monitors the state of the
> - specified containers. The <replaceable>name</replaceable> can be
> - a regular expression, conforming with posix2, so it is possible
> - to monitor all the containers, several of them or just one.
> + <command>lxc-monitor</command> monitors the state of containers. The
> + <replaceable>name</replaceable> argument may be used to specify
> + which containers to monitor. It is a regular expression, conforming
> + with posix2, so it is possible to monitor all the containers,
> + several of them or just one. If not specified,
> + <replaceable>name</replaceable> will default to '.*' which will
> + monitor all containers in <command>lxcpath</command>.
> </para>
>
> <para>
> diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
> index b52fa2e..00ab58b 100644
> --- a/src/lxc/lxc_monitor.c
> +++ b/src/lxc/lxc_monitor.c
> @@ -42,13 +42,14 @@ static const struct option my_longopts[] = {
> static struct lxc_arguments my_args = {
> .progname = "lxc-monitor",
> .help = "\
> ---name=NAME\n\
> +[--name=NAME]\n\
> \n\
> lxc-monitor monitors the state of the NAME container\n\
> \n\
> Options :\n\
> -n, --name=NAME NAME for name of the container\n\
> NAME may be a regular expression",
> + .name = ".*",
> .options = my_longopts,
> .parser = NULL,
> .checker = NULL,
> --
> 1.8.1.4
>
>
> ------------------------------------------------------------------------------
> October Webinars: Code for Performance
> Free Intel webinars can help you accelerate application performance.
> Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
> the latest Intel processors and coprocessors. See abstracts and register >
> http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
