From 737e5afe4cda25c0c509c5aaa0608966f0b39e50 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 26 Dec 2003 00:34:34 +0000 Subject: [PATCH] fixed quoting git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@486 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/rootshell | 7 ++----- util-vserver/scripts/vpstree | 4 +--- util-vserver/scripts/vsysvwrapper | 7 +++---- util-vserver/scripts/vtop | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/util-vserver/scripts/rootshell b/util-vserver/scripts/rootshell index 0331278..d7203b1 100755 --- a/util-vserver/scripts/rootshell +++ b/util-vserver/scripts/rootshell @@ -23,9 +23,6 @@ test -e "$UTIL_VSERVER_VARS" || { } . "$UTIL_VSERVER_VARS" -OPTIONS=$@ -if [ "$OPTIONS" = "" ] ; then - OPTIONS=--login -fi -exec $SBINDIR/chbind --silent --ip 0.0.0.0 /bin/bash $OPTIONS +test "$*" || set -- --login +exec $SBINDIR/chbind --silent --ip 0.0.0.0 /bin/bash "$@" diff --git a/util-vserver/scripts/vpstree b/util-vserver/scripts/vpstree index b918308..66538b6 100755 --- a/util-vserver/scripts/vpstree +++ b/util-vserver/scripts/vpstree @@ -25,6 +25,4 @@ test -e "$UTIL_VSERVER_VARS" || { } . "$UTIL_VSERVER_VARS" -exec $SBINDIR/chcontext --silent --ctx 1 pstree $* - - +exec $SBINDIR/chcontext --silent --ctx 1 pstree "$@" diff --git a/util-vserver/scripts/vsysvwrapper b/util-vserver/scripts/vsysvwrapper index f26ccf5..d06153a 100755 --- a/util-vserver/scripts/vsysvwrapper +++ b/util-vserver/scripts/vsysvwrapper @@ -27,6 +27,7 @@ test -e "$UTIL_VSERVER_VARS" || { if [ $# = 0 ] ; then echo vsysvwrapper service_name >&2 + exit 6 else SERVICE=$1 shift @@ -39,8 +40,6 @@ else do IPOPT="$IPOPT --ip $oneip" done - echo exec $SBINDIR/chbind $IPOPT /etc/init.d/$SERVICE $* - exec $SBINDIR/chbind $IPOPT /etc/init.d/$SERVICE $* + echo exec $SBINDIR/chbind $IPOPT /etc/init.d/$SERVICE "$@" + exec $SBINDIR/chbind $IPOPT /etc/init.d/$SERVICE "$@" fi - - diff --git a/util-vserver/scripts/vtop b/util-vserver/scripts/vtop index ae32b54..839434b 100755 --- a/util-vserver/scripts/vtop +++ b/util-vserver/scripts/vtop @@ -25,4 +25,4 @@ test -e "$UTIL_VSERVER_VARS" || { } . "$UTIL_VSERVER_VARS" -exec $SBINDIR/chcontext --silent --ctx 1 top $* +exec $SBINDIR/chcontext --silent --ctx 1 top "$@" -- 1.8.1.5