X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fconfiguration.xml;h=18a10db85589a0a6ee5a3caac728d9422f77d1bb;hb=66a23bb8328f6df62bcce1f519c4811ba4264cb2;hp=1c34a859fdf53e30e4905787472df52f238a4839;hpb=07a3904f8220fbc4d12d85fb45bc44eeefc3d6ae;p=util-vserver.git
diff --git a/doc/configuration.xml b/doc/configuration.xml
index 1c34a85..18a10db 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.
@@ -67,7 +67,7 @@ a vserver specific setting.
/vservers/.pkg
-
+
The default apt.conf which is going to be used. It is overridden by
distribution specific configuration file.
@@ -196,6 +196,14 @@ operation will fail. Most tools assume 'on' as the default value.
+
+
+
+
+When this file exists, vlogin isn't used on vserver <guest> enter.
+
+
+
@@ -344,19 +352,25 @@ the vserver is stopped, this can be a dangling symlink.
-[experimental; name is subject of possible change] Contains the system capabilities. See
+Contains the system capabilities. See
lib/bcaps-v13.c
for possible values.
-[experimental; name is subject of possible change] Contains the
-context capabilities. See lib/ccaps-v13.c
for possible values.
+
+
+Contains the network capabilities. See lib/ncaps-net.c
+for possible values.
+
+
@@ -374,30 +388,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
@@ -507,7 +515,7 @@ The new process and its children will share a common
Limit the number of process in the vserver according to
ulimit setting. Normally, ulimit is a per user thing.
-With this flag, it becomes a per vserver thing.
+With this flag, it becomes a per vserver thing.
@@ -523,6 +531,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.
@@ -829,7 +844,7 @@ The name of the current vserver.
Repository of initialize like scripts. Before executing the script,
the configuration directory will be made the working directory.
-
+ See initialize.
@@ -870,7 +885,7 @@ The name of the current vserver.
Repository of prepre-start like scripts. Before executing the script,
the configuration directory will be made the working directory.
-
+ See prepre-start.
@@ -912,7 +927,7 @@ The name of the current vserver.
Repository of pre-start like scripts. Before executing these scripts,
the vserver root directory will be made the working directory.
-
+
See pre-start.
@@ -996,7 +1011,7 @@ The name of the current vserver.
Repository of pre-stop like scripts. Before executing the script, the
vserver root directory will be made the working directory.
-
+
See pre-stop.
@@ -1194,24 +1209,23 @@ interface will be executed.
A directory with ulimits. Possible resources are cpu, data, fsize,
-locks, memlock, nofile, nproc, rss and/or stack. This configuration
-will be honored for kernel 2.4 only.
-
+locks, memlock, nofile, nproc, rss and/or stack.
+
A file which contains the hard- and soft-limit of the given resource
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.
@@ -1220,30 +1234,31 @@ 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.
-
+
A file which contains the hard- and soft-limit of the given resource
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.
@@ -1314,5 +1329,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
+
+
+