X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Ffunctions;h=a2ad7f3d21804ba357fed2cdf272fd844e187191;hb=746a16651a2b38b02c4ebc528e73acc388eddcc2;hp=35d25e6df7e04e1744191c70a755bf192bfafc7e;hpb=de848176d34617bb2d80cc9bfac75c373f029118;p=util-vserver.git diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index 35d25e6..a2ad7f3 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 @@ -280,10 +283,10 @@ function getVserverStatus local _tmp=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$_ctx" | $_WC -l ) eval "$3"=\$_tmp - test "$4" -a $_tmp = 0 || return 0 + test "$4" -o $_tmp != 0 || return 1 _tmp=$($_READLINK "$1/run") - test "$_tmp" || return 1 - rm -f "$_tmp" + test "$_tmp" || return 1 + test -z "$4" || rm -f "$_tmp" return 0 } @@ -356,3 +359,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 +}