X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fconfiguration.xml;h=d9f7c55e905b4759e6ef1d4a9c8e8351796c1f00;hb=a0acd80cdb97e8d8679145674e542c3198238885;hp=1c34a859fdf53e30e4905787472df52f238a4839;hpb=07a3904f8220fbc4d12d85fb45bc44eeefc3d6ae;p=util-vserver.git
diff --git a/doc/configuration.xml b/doc/configuration.xml
index 1c34a85..d9f7c55 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -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,15 +352,14 @@ 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.
@@ -507,7 +514,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.
@@ -829,7 +836,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 +877,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 +919,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 +1003,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,21 +1201,20 @@ 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
line. The special keyword 'inf' is recognized.
-
+
A file which contains the soft- of the given resource in the first
@@ -1222,19 +1228,19 @@ 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
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
line. The special keyword 'inf' is recognized.
-
+
A file which contains the soft- of the given resource in the first
@@ -1314,5 +1320,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
+
+
+