From: Enrico Scholz Date: Tue, 13 Apr 2004 08:09:29 +0000 (+0000) Subject: open FD 0 X-Git-Tag: VERSION_0_10~136 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbda8c655efb11b84c25b854aaa2cb4d42ebf122;p=util-vserver.git open FD 0 evaluate CLI options depending on used kernel API git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1445 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vshelper b/util-vserver/scripts/vshelper index ed23384..5ccc6df 100755 --- a/util-vserver/scripts/vshelper +++ b/util-vserver/scripts/vshelper @@ -117,6 +117,7 @@ if ! tty -s; then findObject -e _VS_LOGFILE "$CONFDIR"/.defaults/apps/vshelper/logfile /dev/null findObject -e _VS_ERRFILE "$CONFDIR"/.defaults/apps/vshelper/logfile /dev/null + exec >$_VS_LOGFILE exec 2>>$_VS_ERRFILE fi @@ -132,8 +133,15 @@ vshelper.isEnabled || exit 0 set -eu -declare -r XID=$1 -declare -r ACTION=$2 +if $_VSERVER_INFO - FEATURE vshelper0; then + declare -r XID=$1 + declare -r ACTION=$2 +elif $_VSERVER_INFO - FEATURE vshelper; then + declare -r ACTION=$1 + declare -r XID=$2 +else + panic $"vshelper functionality not supported by kernel" +fi this_xid=$($_VSERVER_INFO - XID)