lxc-monitor default name to .* to monitor all containers

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
index a0aa7df5714f7facda355fccbf6282a47985904b..abd668a4527d1280c5432f02cdeffe60004d17f5 100644 (file)
--- 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 b52fa2e1a605c68e466b40c99474a03ff25fa8cb..00ab58b5119f5e0bfba645e241cf58d503c1dad4 100644 (file)
--- 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,