From: Daniel Hokka Zakrisson Date: Sat, 21 Apr 2007 14:04:35 +0000 (+0000) Subject: Don't do namespace cleanup if we're not in a new namespace. X-Git-Tag: release-0.30.214~74 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd418eca216cdda6b991a1abb7e39e40ec0301c5;p=util-vserver.git Don't do namespace cleanup if we're not in a new namespace. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2531 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/functions b/scripts/functions index 6415353..fe7521b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -519,6 +519,7 @@ function isNamespaceCleanup $_VSERVER_INFO - FEATURE namespace || return 1 cfgdir=$($_VSERVER_INFO "$1" CFGDIR) || return 1 + isAvoidNamespace "$1" && return 1 test -e "$cfgdir"/namespace-cleanup && return 0 test -e "$cfgdir"/nonamespace-cleanup -o \ -e "$__CONFDIR"/.defaults/nonamespace-cleanup && return 1