From: Serge Hallyn Date: Sun, 18 Mar 2012 23:31:40 +0000 (+0100) Subject: Update manpages to reflect some updated options. X-Git-Tag: lxc-0.8.0-rc2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1305dd24af039cefc54bc2f21b04b33b62bb26c8;p=thirdparty%2Flxc.git Update manpages to reflect some updated options. (which reminds me a lxc-clone manpage still needs to be written) Signed-off-by: Serge Hallyn Signed-off-by: Daniel Lezcano --- diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in index f3e852428..a3cca83f0 100644 --- a/doc/lxc-create.sgml.in +++ b/doc/lxc-create.sgml.in @@ -50,7 +50,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA lxc-create -n name -f config_file - -t template + -t template + -B backingstore + -- template-options + @@ -114,6 +117,45 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + + + + + + 'backingstore' is one of 'none', 'lvm', or 'btrfs'. The + default is 'none', meaning that the container root filesystem + will be a directory under @LXCPATH@/container/rootfs. + The option 'btrfs' need not be specified as it will be used + automatically if the @LXCPATH@ filesystem is found to + be btrfs. If backingstore is 'lvm', then an lvm block device will be + used and the following further options are available: + --lvname lvname1 will create an LV + named lvname1 rather than the default, which + is the container name. --vgname vgname1 + will create the LV in volume group vgname1 + rather than the default, lxc. + --fstype FSTYPE will create an FSTYPE + filesystem on the LV, rather than the default, which is ext4. + --fssize SIZE will create a LV (and + filesystem) of size SIZE rather than the default, which is 1G. + + + + + + + + + + This will pass template-options to the + template as arguments. To see the list of options supported by + the template, you can run + lxc-create -t TEMPLATE -h. + + + + diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in index eda425cfe..e75de5750 100644 --- a/doc/lxc-destroy.sgml.in +++ b/doc/lxc-destroy.sgml.in @@ -49,7 +49,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA lxc-destroy -n - name + name + -f + @@ -63,6 +65,27 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + + Options + + + + + + + + + If a container is running, stop it first. If this option is + not specified and the container is running, then + lxc-destroy will be aborted. + + + + + + + Diagnostic diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in index 1f6c29317..4504d5890 100644 --- a/doc/lxc-start.sgml.in +++ b/doc/lxc-start.sgml.in @@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA name -f config_file -c console_file -d -s - KEY=VAL + KEY=VAL -C command @@ -147,6 +147,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + + + + + + If any file descriptors are inherited, close them. If this option + is not specified, then lxc-start will exit with + failure instead. Note: --daemon implies + --close-all-fds. + + + + diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in index 532739e9f..9edabf83b 100644 --- a/doc/lxc.conf.sgml.in +++ b/doc/lxc.conf.sgml.in @@ -452,6 +452,35 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Console devices location + + LXC consoles are provided through Unix98 PTYs created on the + host and bind-mounted over the expected devices in the container. + By default, they are bind-mounted over /dev/console + and /dev/ttyN. This can prevent package upgrades + in the guest. Therefore you can specify a directory location (under + /dev under which LXC will create the files and + bind-mount over them. These will then be symbolically linked to + /dev/console and /dev/ttyN. + A package upgrade can then succeed as it is able to remove and replace + the symbolic links. + + + + + + + + + Specify a directory under /dev + under which to create the container console devices. + + + + + + Mount points