Commit 0f71d073 by Daniel Lezcano Committed by Daniel Lezcano

update the man pages

Update the man pages regarding the modifications around the configuration option, volatile containers and new configuration file format. Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 25c2aca5
...@@ -39,6 +39,7 @@ AS_AC_EXPAND(LIBEXECDIR, $libexecdir) ...@@ -39,6 +39,7 @@ AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
AS_AC_EXPAND(DATADIR, $datadir) AS_AC_EXPAND(DATADIR, $datadir)
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir) AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
AS_AC_EXPAND(DOCDIR, $docdir)
AC_ARG_WITH([config-path], AC_ARG_WITH([config-path],
[AC_HELP_STRING( [AC_HELP_STRING(
...@@ -99,6 +100,14 @@ AC_CONFIG_FILES([ ...@@ -99,6 +100,14 @@ AC_CONFIG_FILES([
doc/common_options.sgml doc/common_options.sgml
doc/see_also.sgml doc/see_also.sgml
doc/examples/Makefile
doc/examples/lxc-macvlan.conf
doc/examples/lxc-no-netns.conf
doc/examples/lxc-empty-netns.conf
doc/examples/lxc-phys.conf
doc/examples/lxc-veth.conf
doc/examples/lxc-complex-config
scripts/Makefile scripts/Makefile
scripts/lxc-debian scripts/lxc-debian
scripts/lxc-fedora scripts/lxc-fedora
...@@ -115,13 +124,6 @@ AC_CONFIG_FILES([ ...@@ -115,13 +124,6 @@ AC_CONFIG_FILES([
src/lxc/lxc-create src/lxc/lxc-create
src/lxc/lxc-destroy src/lxc/lxc-destroy
doc/examples/Makefile
doc/examples/lxc-macvlan.conf
doc/examples/lxc-no-netns.conf
doc/examples/lxc-empty-netns.conf
doc/examples/lxc-phys.conf
doc/examples/lxc-veth.conf
doc/examples/lxc-complex-config
]) ])
AC_CONFIG_COMMANDS([default],[[]],[[]]) AC_CONFIG_COMMANDS([default],[[]],[[]])
AC_OUTPUT AC_OUTPUT
......
...@@ -66,17 +66,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -66,17 +66,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</para> </para>
<para> <para>
If the container does not exist, it is automatically created and
destroyed at the end. The command can use the configuration file
to create itself the container
like <command>lxc-create</command> would do and will destroy the
container when the application exits. If the container was
previously created with the lxc-create command, when the
application exits, the container is not destroyed and it can be
reused later.
</para>
<para>
This command is mainly used when you want to quickly launch an This command is mainly used when you want to quickly launch an
application in an isolated environment. It will create an application in an isolated environment. It will create an
intermediate process allowing you application to daemonize in intermediate process allowing you application to daemonize in
......
...@@ -60,10 +60,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -60,10 +60,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<para> <para>
<command>lxc-start</command> runs the specified command inside <command>lxc-start</command> runs the specified command inside
the container specified by name. It will setup the container the container specified by name. It will setup the container
according with the configuration defined previously with the according the configuration previously defined with the
lxc-create command and execute the command inside the lxc-create command or with the configuration file parameter and
container. The orphan process group and daemon are not supported execute the command inside the container. If no configuration is
by this command. defined, the default isolation is used. The orphan process
group and daemon are not supported by this command.
If no command is specified, <command>lxc-start</command> will If no command is specified, <command>lxc-start</command> will
use the default use the default
...@@ -93,6 +94,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -93,6 +94,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
<option>-f <replaceable>config_file</replaceable></option>
</term>
<listitem>
<para>
Specify the configuration file to configure the virtualization
and isolation functionalities for the container.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>
......
...@@ -318,6 +318,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -318,6 +318,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
<option>lxc.mount.entry</option>
</term>
<listitem>
<para>
specify a mount point corresponding to a line in the
fstab format.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect2> </refsect2>
...@@ -579,6 +592,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -579,6 +592,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<listitem><para></para></listitem> <listitem><para></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>lxc.mount.entry = /lib /root/myrootfs/lib none ro,bind 0 0</term>
<listitem><para></para></listitem>
</varlistentry>
<varlistentry>
<term>lxc.rootfs = /mnt/rootfs.complex</term> <term>lxc.rootfs = /mnt/rootfs.complex</term>
<listitem><para></para></listitem> <listitem><para></para></listitem>
</varlistentry> </varlistentry>
......
...@@ -59,7 +59,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -59,7 +59,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
a container with a predefined configuration template, it may a container with a predefined configuration template, it may
work. work.
<command> <command>
@BINDIR@/lxc-execute -n foo -f @SYSCONFDIR@/lxc/lxc-macvlan.conf /bin/bash @BINDIR@/lxc-execute -n foo -f @DOCDIR@/examples/lxc-macvlan.conf /bin/bash
</command> </command>
</para> </para>
</refsect1> </refsect1>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment