From: Daniel Hokka Zakrisson Date: Tue, 14 Nov 2006 23:06:30 +0000 (+0000) Subject: Enable namespace cleanup by default. X-Git-Tag: release-0.30.212~44 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da54055d8657f709741f35ff0522bfeb7903538f;p=util-vserver.git Enable namespace cleanup by default. Various cleanups in the documentation, make sure references work. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2379 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/doc/configuration.xml b/doc/configuration.xml index 98b04ec..4887920 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. @@ -381,30 +381,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 @@ -1322,7 +1316,7 @@ tools and can *not* be modified. - + The initial amount of tokens to put in the bucket @@ -1362,24 +1356,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 diff --git a/scripts/functions b/scripts/functions index a2b4362..8f73ec8 100644 --- a/scripts/functions +++ b/scripts/functions @@ -496,10 +496,10 @@ function isNamespaceCleanup $_VSERVER_INFO - FEATURE namespace || return 1 cfgdir=$($_VSERVER_INFO "$1" CFGDIR) || return 1 - test -e "$cfgdir"/nonamespace-cleanup && return 1 - test -e "$__CONFDIR"/.defaults/namespace-cleanup -o \ - -e "$cfgdir"/namespace-cleanup && return 0 - return 1 + test -e "$cfgdir"/namespace-cleanup && return 0 + test -e "$cfgdir"/nonamespace-cleanup -o \ + -e "$__CONFDIR"/.defaults/nonamespace-cleanup && return 1 + return 0 } ## Usage: getAllVservers [*]