X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvsysvwrapper;h=da9754e2a22b67e5ec05714e24fa784b092c62e6;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=f26ccf5117fb34c1c5283dedcaad14b593a12faf;hpb=06e1018272502e1d15d6d8f32b80fa96420785b8;p=util-vserver.git diff --git a/scripts/vsysvwrapper b/scripts/vsysvwrapper index f26ccf5..da9754e 100755 --- a/scripts/vsysvwrapper +++ b/scripts/vsysvwrapper @@ -18,15 +18,16 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Helper script for all the v_xxx scripts -: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$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 $_CHBIND $IPOPT /etc/init.d/$SERVICE "$@" + exec $_CHBIND $IPOPT /etc/init.d/$SERVICE "$@" fi - -