Merge pull request #3067 from Rachid-Koucha/patch-1

[mirror_lxc.git] / doc / lxc-start.sgml.in

diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
index 07f9845b8701c89b55d0fc86c054d99392715ea0..1f6fbb741926b746e8d8c35c32c78cda9fe39a0c 100644 (file)
--- a/doc/lxc-start.sgml.in
+++ b/doc/lxc-start.sgml.in
@@ -54,6 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       <arg choice="opt">-c <replaceable>console_device</replaceable></arg>
       <arg choice="opt">-L <replaceable>console_logfile</replaceable></arg>
       <arg choice="opt">-d</arg>
+      <arg choice="opt">-F</arg>
       <arg choice="opt">-p <replaceable>pid_file</replaceable></arg>
       <arg choice="opt">-s KEY=VAL</arg>
       <arg choice="opt">-C</arg>
@@ -79,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
     </para>
     <para>
       If no command is specified, <command>lxc-start</command> will
-      use the default
+      use the command defined in lxc.init.cmd or if not set, the default
       <command>"/sbin/init"</command> command to run a system
       container.
     </para>
@@ -100,7 +101,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
          <para>
            Run the container as a daemon. As the container has no
            more tty, if an error occurs nothing will be displayed,
-           the log file can be used to check the error.
+           the log file can be used to check the error. (This is the default mode)
+         </para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term>
+         <option>-F, --foreground</option>
+       </term>
+       <listitem>
+         <para>
+           Run the container in the foreground. In this mode, the container
+           console will be attached to the current tty and signals will be routed
+           directly to the container.
          </para>
        </listitem>
       </varlistentry>