X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Ffunctions;h=3ffee15c14412fac2af43ee4a7b2498996324a1a;hb=1a164f15f34c052a9deaa2f967e57d516286179e;hp=35d25e6df7e04e1744191c70a755bf192bfafc7e;hpb=de848176d34617bb2d80cc9bfac75c373f029118;p=util-vserver.git diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index 35d25e6..3ffee15 100644 --- a/util-vserver/scripts/functions +++ b/util-vserver/scripts/functions @@ -242,10 +242,13 @@ function pkgInit function isAvoidNamespace { - $_VSERVER_INFO - FEATURE namespace || return 1 - test ! -e "$1"/namespace || return 1 + local cfgdir + + $_VSERVER_INFO - FEATURE namespace || return 0 + cfgdir=$($_VSERVER_INFO "$1" CFGDIR) || return 0 + test ! -e "$cfgdir"/namespace || return 1 test -e "$CONFDIR"/.defaults/nonamespace -o \ - -e "$1"/nonamespace + -e "$cfgdir"/nonamespace } function getAllVservers @@ -268,6 +271,7 @@ function getAllVservers } ## Usage: getVserverCtx [ []] +## Returns: 0 iff vserver is running function getVserverStatus { test -r "$1"/run || return 1 @@ -280,10 +284,12 @@ function getVserverStatus local _tmp=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$_ctx" | $_WC -l ) eval "$3"=\$_tmp - test "$4" -a $_tmp = 0 || return 0 - _tmp=$($_READLINK "$1/run") - test "$_tmp" || return 1 - rm -f "$_tmp" + if test "$_tmp" = 0; then + local runfile=$($_READLINK "$1/run") + test -z "$4" || rm -f "$runfile" + return 1 + fi + return 0 } @@ -356,3 +362,19 @@ function isKernelAPI local api=$($_VSERVER_INFO - APIVER) || api=0 test $[ $api ] -${2:-ge} $[ $1 ] } + +## Usage: callInNamespace * +function callInNamespace +{ + local ctx= + + isAvoidNamespace "$1" || \ + ctx=$( $_VSERVER_INFO "$1" CONTEXT t ) || ctx= + + shift + if test "$ctx"; then + $_VNAMESPACE --enter "$ctx" -- "$@" + else + "$@" + fi +}