X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fconfiguration.xml;h=18a10db85589a0a6ee5a3caac728d9422f77d1bb;hb=fc84d2d3d5179f3bbbcee0f7e8d8cb155239edfd;hp=d9f7c55e905b4759e6ef1d4a9c8e8351796c1f00;hpb=a0acd80cdb97e8d8679145674e542c3198238885;p=util-vserver.git diff --git a/doc/configuration.xml b/doc/configuration.xml index d9f7c55..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. @@ -364,6 +364,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. + + @@ -381,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 @@ -530,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. @@ -1211,13 +1219,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. @@ -1226,7 +1234,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. @@ -1237,19 +1246,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. @@ -1321,7 +1330,7 @@ tools and can *not* be modified. - + The initial amount of tokens to put in the bucket @@ -1361,24 +1370,24 @@ tools and can *not* be modified. The bucket's size - Amount of tokens to add each interval + 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 + 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