X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Ffunctions;h=a4a02a2aecfe23c4e122bad1f178e69b4656d5b4;hb=bb23ba0d1b3ab139512fd137a5e7f7241a49c2d6;hp=1b94ce464ed6df4ba0a1b1208a1b4c9006de0a1d;hpb=9775cd4fff7e44e02de1f5d962377457f433ba50;p=util-vserver.git diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index 1b94ce4..a4a02a2 100644 --- a/util-vserver/scripts/functions +++ b/util-vserver/scripts/functions @@ -78,7 +78,7 @@ function _pkgMountBindDir() function _pkgSetVarsBase { case "$vserver" in - /*) + ./*|/*) if test -d "$vserver/vdir"; then BASEDIR=$vserver VDIR=$(getPhysicalDir "$vserver/vdir") @@ -237,6 +237,13 @@ function pkgInit _PKG_VSERVER=$vserver } +function isAvoidNamespace +{ + test ! -e "$1"/namespace || return 1 + test -e "$CONFDIR"/.defaults/nonamespace -o \ + -e "$1"/nonamespace +} + function getAllVservers { local i @@ -260,10 +267,13 @@ function getAllVservers function getVserverStatus { test -r "$1"/run || return 1 - eval read "$2" <"$1"/run + + local _ctx + read _ctx <"$1"/run + eval "$2"=\$_ctx test "$3" || return 0 - local _tmp=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$ctx" | $_WC -l ) + local _tmp=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$_ctx" | $_WC -l ) eval "$3"=\$_tmp test "$4" -a $_tmp = 0 || return 0 @@ -273,6 +283,13 @@ function getVserverStatus return 0 } +## Usage: isCtxRunning +function isCtxRunning +{ + local _tmp=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$1" | $_WC -l ) + test $_tmp -gt 0 +} + ## Usage: isVserverRunning [] function isVserverRunning {