af_unix: add lxc_abstract_unix_send_fds_iov

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

diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
index de233f68f86b2228c44534e2732f384bb7bb3782..617888c08419e7cc06c5a1f694a2fe4e7f585785 100644 (file)
--- a/doc/lxc-execute.sgml.in
+++ b/doc/lxc-execute.sgml.in
@@ -19,11 +19,11 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
@@ -50,8 +50,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <cmdsynopsis>
       <command>lxc-execute</command>
       <arg choice="req">-n <replaceable>name</replaceable></arg>
+      <arg choice="opt">-d</arg>
       <arg choice="opt">-f <replaceable>config_file</replaceable></arg>
       <arg choice="opt">-s KEY=VAL</arg>
+      <arg choice="opt">-u, --uid <replaceable>uid</replaceable></arg>
+      <arg choice="opt">-g, --gid <replaceable>gid</replaceable></arg>
       <arg choice="opt">-- <replaceable>command</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -81,7 +84,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
       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).
+      (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.
@@ -89,8 +92,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
      <para>
       The above <command>lxc-init</command> is designed to forward received
       signals to the started command.
-      So <command>lxc-kill</command> (1) sent signal is received
-      by the user specified command (pid 2 in the container).
      </para>
   </refsect1>
 
@@ -126,6 +127,44 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
          </para>
        </listitem>
       </varlistentry>
+
+      <varlistentry>
+       <term>
+         <option>-d, --daemon</option>
+       </term>
+       <listitem>
+         <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.
+         </para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term>
+         <option>--u, --uid <replaceable>uid</replaceable></option>
+       </term>
+       <listitem>
+         <para>
+           Executes the <replaceable>command</replaceable> with user ID
+           <replaceable>uid</replaceable> inside the container.
+         </para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term>
+         <option>--g, --gid <replaceable>gid</replaceable></option>
+       </term>
+       <listitem>
+         <para>
+           Executes the <replaceable>command</replaceable> with group ID
+           <replaceable>gid</replaceable> inside the container.
+         </para>
+       </listitem>
+      </varlistentry>
+
       <varlistentry>
        <term><option>--</option></term>
        <listitem>