From: Daniel Lezcano Date: Fri, 20 Nov 2009 14:01:30 +0000 (+0100) Subject: update the man pages X-Git-Tag: lxc_0_6_4~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a22713f648be8bd21297f57d9b631eb4c537ffe;p=thirdparty%2Flxc.git update the man pages Update the man pages regarding the different modifications. Signed-off-by: Daniel Lezcano --- diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in index 343f310cf..ccc2b0113 100644 --- a/doc/lxc-create.sgml.in +++ b/doc/lxc-create.sgml.in @@ -58,11 +58,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA lxc-create creates a system object where is - stored the configuration informations and where will be stored - runtime information. The - identifier name is used to - specify the container to be used with the different lxc - commands. + stored the configuration informations and where can be stored + user information. The identifier name + is used to specify the container to be used with the different + lxc commands. @@ -99,8 +98,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - &commonoptions; - Diagnostic diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in index f8c063ac4..841755b73 100644 --- a/doc/lxc-destroy.sgml.in +++ b/doc/lxc-destroy.sgml.in @@ -48,8 +48,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - lxc-destroy -n name - + lxc-destroy -n + name @@ -57,15 +57,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Description - lxc-destroy destroys the system container - object. After the destruction the container is no longer + lxc-destroy destroys the directory where is + stored the configuration and all the data contained in this + directory. After the destruction the container is no longer available and should be recreated. - &commonoptions; - Diagnostic @@ -83,17 +82,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - The container is busy - - - The specified container is running an application. At this - point it is not destroyable, and it should be stopped - before trying to destroy it. - - - - diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in index fdf64c500..827b58999 100644 --- a/doc/lxc-start.sgml.in +++ b/doc/lxc-start.sgml.in @@ -47,11 +47,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - lxc-start -n name - command - - + lxc-start -n + name -f + config_file command @@ -63,8 +61,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 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. + defined, the default isolation is used. The orphan process group + and daemon are not supported by this command, use + the lxc-execute command instead. If no command is specified, lxc-start will use the default diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in index 8f08ef7f7..33d6845ff 100644 --- a/doc/lxc.sgml.in +++ b/doc/lxc.sgml.in @@ -58,9 +58,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA without warranty, here are the commands to launch a shell inside a container with a predefined configuration template, it may work. - - @BINDIR@/lxc-execute -n foo -f @DOCDIR@/examples/lxc-macvlan.conf /bin/bash - + @BINDIR@/lxc-execute -n foo -f + @DOCDIR@/examples/lxc-macvlan.conf /bin/bash @@ -121,6 +120,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -> User namespace -> Pid namespace -> Network namespace + * Device Drivers + * Character devices + -> Support multiple instances of devpts + * Network device support + -> MAC-VLAN support + -> Virtual ethernet pair device + * Networking + * Networking options + -> 802.1d Ethernet Bridging * Security options -> File POSIX Capabilities @@ -133,6 +141,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA With the kernel 2.6.29, lxc is fully functional. + + The helper script lxc-checkconfig will give + you information about your kernel configuration. @@ -164,7 +175,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA A container is an object where the configuration is persistent. The application will be launched inside this container and it will use the configuration which was previously - created. + created or specified in parameter of the command. How to run an application in a container ? @@ -295,6 +306,13 @@ rootfs + + Volatile containers + The container can be directly started with a + configuration file in parameter without creating them before. + + + Configuration The container is configured through a configuration @@ -325,9 +343,12 @@ rootfs Starting / Stopping a container When the container has been created, it is ready to run an - application / system. When the application has to be destroyed + application / system. When the application has to be destroyed, the container can be stopped, that will kill all the processes - of the container. + of the container. If the container was not created before + starting the application, the container will use the + configuration file passed as parameter to the command, otherwise + it will use the default isolation. Running an application inside a container is not exactly the