X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fconfiguration.xml;h=8db75d18fcbc3616bc32aec78eb3fa8b84f7a338;hb=3564d8678a2134185e5e6e83083de027b359ca28;hp=4887920815a2fefac5a427eabd4e53713f71ce75;hpb=da54055d8657f709741f35ff0522bfeb7903538f;p=util-vserver.git
diff --git a/doc/configuration.xml b/doc/configuration.xml
index 4887920..8db75d1 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -62,6 +62,34 @@ NOTE: this link exists in 0.30.202+ only; in previous versions it was
a vserver specific setting.
+
+
+
+Contains the pathname of the shell which will be used by the "vserver
+... enter" command. Can be overridden by the
+per-guest shell.
+
+
+
+
+
+The default fstab file to put in newly built guests.
+
+
+
+
+
+If this file exists, kernel-side dynamic contexts will be used by the "vserver
+... build" command. Otherwise a context will be generated, based on the
+contents of context.next.
+
+
+
+
+
+The context id to use for the next guest created by "vserver ... build".
+
+
@@ -89,6 +117,33 @@ from this uri and install it at a temporary place.
+
+
+ 'x' is an arbitrary name, replace it with e.g. device names
+
+ When this file exists, the device can be opened
+
+
+ When this file exists, the device can be created (if the guest has CAP_MKNOD)
+
+
+
+When this file exists, target will
+have to exist as well and opening the device will in fact open the target device
+
+
+
+ This file will let you specify unimplemented flags manually
+
+
+ Contains the name of a device node
+
+
+ Contains the device node of the target node to open instead of the device when remap is set
+
+
+
+
@@ -101,7 +156,7 @@ is invoked from the kernel. This should point somewhere e.g. into
-See vshelper/action.
+See vshelper/action.
@@ -204,6 +259,14 @@ When this file exists, vlogin isn't used on vserver <guest> enter.
+
+
+
+
+A list of default options to supply to vserver ... build, one option per line.
+
+
+
@@ -214,6 +277,34 @@ interface will be executed.
+
+
+ This directory contains some files which will be copied to the guests during build.
+
+ The default /etc/hosts file.
+
+
+ The default /etc/nsswitch.conf file.
+
+
+ The default /etc/krb5.conf file.
+
+
+ The default /etc/krb.conf file.
+
+
+ The default /etc/krb.realms file.
+
+
+ The default /etc/ldap.conf file.
+
+
+ The default /etc/localtime file.
+
+
+ The default /etc/resolv.conf file.
+
+
@@ -321,6 +412,11 @@ this distribution.
+
+
+Symlink to the default template for this distribution.
+
+
@@ -364,6 +460,13 @@ url="http://svn.linux-vserver.org/svn/util-vserver/trunk/lib/ccaps-v13.c">lib/cc
for possible values.
+
+
+Contains the network capabilities. See lib/ncaps-net.c
+for possible values.
+
+
@@ -464,7 +567,7 @@ Contains per line a capability. This file is used for the 2.4 kernel
only; for 2.6 use bcapabilities.
-
+
Contains the pathname of the shell which will be used by the "vserver
... enter" command.
@@ -524,6 +627,13 @@ Apply the current ulimit to the whole context
-->
+
+
+Contains a network flag per line. See lib/nflags-net.c
+for possible values.
+
+
Contains the context which shall be used for the vserver.
@@ -541,7 +651,7 @@ the 'fstab' file should be used.
The fstab file for the vserver. Entries in this file will be mounted
-within the network context of the host; this means that mount will be
+within the network context of the guest; this means that mount will be
called as chbind <options> mount .... See
fstab also.
@@ -671,7 +781,7 @@ assumed.
-
+ restart
The action which is going to be executed when a vshelper event
@@ -728,7 +838,7 @@ skipped.
-See vshelper/action.
+See vshelper/action.
@@ -1205,13 +1315,13 @@ in the first line. The special keyword 'inf' is recognized.
-A file which contains the hard- of the given resource in the first
+A file which contains the hard-limit of the given resource in the first
line. The special keyword 'inf' is recognized.
-A file which contains the soft- of the given resource in the first
+A file which contains the soft-limit of the given resource in the first
line. The special keyword 'inf' is recognized.
@@ -1232,19 +1342,19 @@ in the first line. The special keyword 'inf' is recognized.
-A file which contains the hard- of the given resource in the first
+A file which contains the hard-limit of the given resource in the first
line. The special keyword 'inf' is recognized.
-A file which contains the soft- of the given resource in the first
+A file which contains the soft-limit of the given resource in the first
line. The special keyword 'inf' is recognized.
-A file which contains the guaranted minimum of the given resource in
+A file which contains the guaranteed minimum of the given resource in
the first line. The special keyword 'inf' is recognized.
@@ -1295,6 +1405,18 @@ tools and can *not* be modified.
+
+
+ 'x' is an arbitrary name, replace it with e.g. integers
+
+ The sysctl setting
+
+
+ The value
+
+
+
+
The name of the cpuset for this vserver