From: Enrico Scholz Date: Tue, 6 Apr 2004 08:43:40 +0000 (+0000) Subject: cleanups X-Git-Tag: VERSION_0_10~157 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3248f9e63fa0cbb86c9afcb4d94c854a1368f16;p=util-vserver.git cleanups vshelper.doInit(): added another sanity check git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1424 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index d3a2c40..8ac1cfc 100644 --- a/util-vserver/scripts/functions +++ b/util-vserver/scripts/functions @@ -561,9 +561,9 @@ function vshelper.doSanityCheck test -d "$VSHELPERSTATEDIR" || { warnings=( "${warnings[@]}" $"\ -The vshelper state-directory '$VSHELPERSTATEDIR' does not exist; - since it is created by 'make install', this indicates a serious - problem with your util-vserver installation" ) +The vshelper state-directory '$VSHELPERSTATEDIR' does not exist; since +it is created by 'make install', this indicates a serious problem with +your util-vserver installation" ) solution_disable=1 } @@ -665,8 +665,8 @@ function vshelper.doInit { vshelper.isEnabled || return 0 - local xid=$($_VSERVER_INFO "$1" CONTEXT false) || { - warning $"vshelper.init: can not determine xid of vserver '$vserver'" + local xid=$($_VSERVER_INFO "$1" CONTEXT false) && test "$xid" || { + warning $"vshelper.init: can not determine xid of vserver '$vserver'; returned value was '$xid'" return 1 }