X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fconfiguration.xml;h=8db75d18fcbc3616bc32aec78eb3fa8b84f7a338;hb=3564d8678a2134185e5e6e83083de027b359ca28;hp=4acd1e64640ecf3d5ed58bfd74e4761b7073cff8;hpb=47475c15809648d8f76d545a903cc6d83108439b;p=util-vserver.git
diff --git a/doc/configuration.xml b/doc/configuration.xml
index 4acd1e6..8db75d1 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -37,10 +37,10 @@ the 'barrier' attribute. Else, common chroot(2) exploits are possible.
-
+
-Enable namespace cleanup globally. It can be overridden for a single vserver
-by setting the nonamespace-cleanup flag
+Disable namespace cleanup globally. It can be overridden for a single vserver
+by setting the namespace-cleanup flag
there.
@@ -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.
@@ -196,6 +251,22 @@ operation will fail. Most tools assume 'on' as the default value.
+
+
+
+
+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.
+
+
+
@@ -206,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.
+
+
@@ -313,6 +412,11 @@ this distribution.
+
+
+Symlink to the default template for this distribution.
+
+
@@ -356,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.
+
+
@@ -373,30 +484,24 @@ the 'barrier' attribute. Else, common chroot(2) exploits are possible.
-
+
-Overrides the global namespace-cleanup flag and disables
+Overrides the global nonamespace-cleanup flag and enables
namespace cleanup for the current vserver.
-
-
-Enable namespace cleanup for the current vserver.
-
-
-
-List of paths to skip during namespace cleanup. This overrides the
-global namespace-cleanup-skip
+List of paths to skip during namespace cleanup. This overrides the global
+namespace-cleanup-skip
file.
-[experimental; name is subject of possible change] Contains the
+[deprecated; use sched instead] Contains the
scheduler parameters, one per line.
The Hard CPU limit uses a mechanism called a Token Bucket. the
@@ -462,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.
@@ -522,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.
@@ -539,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.
@@ -669,7 +781,7 @@ assumed.
-
+ restart
The action which is going to be executed when a vshelper event
@@ -726,7 +838,7 @@ skipped.
-See vshelper/action.
+See vshelper/action.
@@ -1203,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.
@@ -1218,7 +1330,8 @@ line. The special keyword 'inf' is recognized.
A directory with resource limits. Possible resources are cpu, fsize,
-data, stack, core, rss, nproc, nofile, memlock, as and locks. This
+data, stack, core, rss, nproc, nofile, memlock, as, locks, msgqueue,
+nsock, openfd, anon, shmem, semary, nsems and dentry. This
configuration will be honored for kernel 2.6 only.
@@ -1229,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.
@@ -1292,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
@@ -1312,5 +1437,71 @@ tools and can *not* be modified.
When this file exists, the cpuset will be assumed to exist already
+
+
+
+ The initial amount of tokens to put in the bucket
+
+
+ The minimum amount of tokens required to unhold the context
+
+
+ The bucket's size
+
+
+ Amount of tokens to add each interval
+
+
+ The interval between refills of the bucket
+
+
+ Bias added to priorities calculated within the guest (result is clamped to -20/+19)
+
+
+ Amount of tokens to add each interval2 when advancing idle time
+
+
+ The interval between refills of the bucket when advancing idle time
+
+
+ When this file exists, advancing idle time is activated
+
+
+ This directory contains per-CPU and/or per-bucket specific settings. Remember to set the cpu-id file. All CPUs inherit the global settings.
+
+ The initial amount of tokens to put in the bucket
+
+
+ The minimum amount of tokens required to unhold the context
+
+
+ The bucket's size
+
+
+ Amount of tokens to add each interval
+
+
+ The interval between refills of the bucket
+
+
+ Bias added to priorities calculated within the guest (result is clamped to -20/+19)
+
+
+ Amount of tokens to add each interval2 when advancing idle time
+
+
+ The interval between refills of the bucket when advancing idle time
+
+
+ When this file exists, advancing idle time is activated
+
+
+ The CPU to apply these settings to
+
+
+ The bucket to apply these settings to
+
+
+