man update lxc-execute and lxc-start (V2)

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
index 46d0d1a5e14cfba344ccffcd5ab19f59e71c981c..fe51b9bf34202938544684fa9974f0dd8177c80c 100644 (file)
--- a/doc/lxc-execute.sgml.in
+++ b/doc/lxc-execute.sgml.in
@@ -60,20 +60,32 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <title>Description</title>
 
     <para>
-      <command>lxc-execute</command> runs
-      the <replaceable>command</replaceable> inside the container
-      specified by <replaceable>name</replaceable>. This command
-      should be used to launch an application, eg. sshd or bash.
+      <command>lxc-execute</command> runs the specified
+      <replaceable>command</replaceable> inside the container
+      specified by <replaceable>name</replaceable>.
+    </para>
+    <para>
+      It will setup the container
+      according to the configuration previously defined with the
+      lxc-create command or with the configuration file parameter.
+      If no configuration is
+      defined, the default isolation is used.
     </para>
-
     <para>
       This command is mainly used when you want to quickly launch an
-      application in an isolated environment. It will create an
-      intermediate process allowing you application to daemonize in
-      the pid namespace and will mount the proc filesystem to complete
-      the pid isolation.
+      application in an isolated environment.
     </para>
-
+    <para>
+      <command>lxc-execute</command> command will run the
+      specified command into the container via an intermediate
+      process, <command>lxc-init</command>.
+      This lxc-init after launching  the specified command,
+      will wait for its end and all other reparented processes.
+      (that allows to support daemons in the container).
+      In other words, in the
+      container, <command>lxc-init</command> has the pid 1 and the
+      first process of the application has the pid 2.
+     </para>
   </refsect1>
 
   <refsect1>
@@ -82,18 +94,23 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
       <varlistentry>
        <term>
-         <option>-f <replaceable>config_file</replaceable></option>
+         <option>-f, --rcfile <replaceable>config_file</replaceable></option>
        </term>
        <listitem>
          <para>
            Specify the configuration file to configure the virtualization
            and isolation functionalities for the container.
          </para>
+         <para>
+          This configuration file if present will be used even if there is
+          already a configuration file present in the previously created
+          container (via lxc-create).
+         </para>
        </listitem>
       </varlistentry>
       <varlistentry>
        <term>
-         <option>-s <replaceable>KEY=VAL</replaceable></option>
+         <option>-s, --define <replaceable>KEY=VAL</replaceable></option>
        </term>
        <listitem>
          <para>

diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
index 5bb34cdb32d32ea0c42651615882efd254b33528..24e467afeb10620009c0d352337d0b9e96b18c70 100644 (file)
--- a/doc/lxc-start.sgml.in
+++ b/doc/lxc-start.sgml.in
@@ -57,20 +57,27 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <title>Description</title>
 
     <para>
-      <command>lxc-start</command> runs the specified command inside
-      the container specified by name. It will setup the container
-      according the configuration previously defined with the
-      lxc-create command or with the configuration file parameter and
-      execute the command inside the container. If no configuration is
-      defined, the default isolation is used. The orphan process group
+      <command>lxc-start</command> runs the specified
+      <replaceable>command</replaceable> inside the container
+      specified by <replaceable>name</replaceable>.
+    </para>
+    <para>
+      It will setup the container
+      according to the configuration previously defined with the
+      lxc-create command or with the configuration file parameter.
+      If no configuration is
+      defined, the default isolation is used.
+    </para>
+    <para>
+      The orphan process group
       and daemon are not supported by this command, use
       the <command>lxc-execute</command> command instead.
-      
+    </para>
+    <para>
       If no command is specified, <command>lxc-start</command> will
       use the default
       <command>"/sbin/init"</command> command to run a system
       container.
-      
     </para>
 
   </refsect1>
@@ -96,7 +103,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
       <varlistentry>
        <term>
-         <option>-f <replaceable>config_file</replaceable></option>
+         <option>-f, --rcfile <replaceable>config_file</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -108,7 +115,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
       <varlistentry>
        <term>
-         <option>-s <replaceable>KEY=VAL</replaceable></option>
+         <option>-s, --define <replaceable>KEY=VAL</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -141,16 +148,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
         </listitem>
       </varlistentry>    
 
-      <varlistentry>
-        <term>The container was not found</term>
-        <listitem>
-          <para>
-           The specified container was not created before with
-           the <command>lxc-create</command>
-          </para>
-        </listitem>
-      </varlistentry>    
-
     </variablelist>
 
   </refsect1>