aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@free.fr>2009-11-19 15:06:02 +0100
committerDaniel Lezcano <dlezcano@fr.ibm.com>2009-11-19 15:06:02 +0100
commit0f71d073eec849672b7f5a089fb4697f423c35bc (patch)
treed0dfaea14e95a8482b013c73bb5e5ef36e98979a /doc
parentexport set_state function (diff)
downloadlxc-0f71d073eec849672b7f5a089fb4697f423c35bc.tar.gz
lxc-0f71d073eec849672b7f5a089fb4697f423c35bc.tar.bz2
lxc-0f71d073eec849672b7f5a089fb4697f423c35bc.zip
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: Daniel Lezcano <dlezcano@fr.ibm.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/lxc-execute.sgml.in11
-rw-r--r--doc/lxc-start.sgml.in21
-rw-r--r--doc/lxc.conf.sgml.in17
-rw-r--r--doc/lxc.sgml.in2
4 files changed, 35 insertions, 16 deletions
diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
index 6d5bcd4..ddd3a13 100644
--- a/doc/lxc-execute.sgml.in
+++ b/doc/lxc-execute.sgml.in
@@ -66,17 +66,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</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
application in an isolated environment. It will create an
intermediate process allowing you application to daemonize in
diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
index 7a92519..fdf64c5 100644
--- a/doc/lxc-start.sgml.in
+++ b/doc/lxc-start.sgml.in
@@ -60,10 +60,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<para>
<command>lxc-start</command> runs the specified command inside
the container specified by name. It will setup the container
- according with the configuration defined previously with the
- lxc-create command and execute the command inside the
- container. The orphan process group and daemon are not supported
- by this command.
+ 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 and daemon are not supported by this command.
If no command is specified, <command>lxc-start</command> will
use the default
@@ -93,6 +94,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</listitem>
</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>
</refsect1>
diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
index aed8f1f..c128333 100644
--- a/doc/lxc.conf.sgml.in
+++ b/doc/lxc.conf.sgml.in
@@ -318,6 +318,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</para>
</listitem>
</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>
</refsect2>
@@ -579,6 +592,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<listitem><para></para></listitem>
</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>
<listitem><para></para></listitem>
</varlistentry>
diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
index af2efab..8f08ef7 100644
--- a/doc/lxc.sgml.in
+++ b/doc/lxc.sgml.in
@@ -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
work.
<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>
</para>
</refsect1>