From: Enrico Scholz Date: Tue, 9 Mar 2004 03:56:20 +0000 (+0000) Subject: getVserverStatus(): fixed it for the non-running & non-cleanup case X-Git-Tag: VERSION_0_10~397 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ad369a7807de5ca6ea2988a310722f36249ffa;p=util-vserver.git getVserverStatus(): fixed it for the non-running & non-cleanup case git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1176 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index 35d25e6..0581dd7 100644 --- a/util-vserver/scripts/functions +++ b/util-vserver/scripts/functions @@ -242,7 +242,7 @@ function pkgInit function isAvoidNamespace { - $_VSERVER_INFO - FEATURE namespace || return 1 + $_VSERVER_INFO - FEATURE namespace || return 0 test ! -e "$1"/namespace || return 1 test -e "$CONFDIR"/.defaults/nonamespace -o \ -e "$1"/nonamespace @@ -280,10 +280,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 }