From: Daniel Hokka Zakrisson Date: Mon, 20 Nov 2006 15:09:19 +0000 (+0000) Subject: Use $_CHBIND_COMPAT directly for legacy. X-Git-Tag: release-0.30.212~35 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a39c4f55f865d1294a5e11c93b3d9c783b547eff;p=util-vserver.git Use $_CHBIND_COMPAT directly for legacy. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2388 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/legacy/vserver b/scripts/legacy/vserver index e944617..5d94548 100755 --- a/scripts/legacy/vserver +++ b/scripts/legacy/vserver @@ -529,7 +529,7 @@ elif [ "$2" = "start" ] ; then cd $__DEFAULT_VSERVERDIR/$1 IPOPT=`setipopt $IPROOT` export PATH=$DEFAULTPATH - $NICECMD $_CHBIND $SILENT $IPOPT --bcast $IPROOTBCAST \ + $NICECMD $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \ $_CHCONTEXT_COMPAT $SILENT $DISCONNECT $CAPS $FLAGS $CTXOPT $HOSTOPT $DOMAINOPT --secure \ $_SAVE_S_CONTEXT $__PKGSTATEDIR/$1.ctx \ $_CAPCHROOT $CHROOTOPT . $STARTCMD @@ -611,7 +611,7 @@ elif [ "$2" = "stop" ] ; then cd $__DEFAULT_VSERVERDIR/$1 IPOPT=`setipopt $IPROOT` export PATH=$DEFAULTPATH - $_CHBIND $SILENT $IPOPT --bcast $IPROOTBCAST \ + $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \ $_CHCONTEXT_COMPAT $SILENT $CAPS --secure --ctx $S_CONTEXT \ $_CAPCHROOT . $STOPCMD @@ -625,7 +625,7 @@ elif [ "$2" = "stop" ] ; then fi echo Killing all processes - $_CHBIND --silent $IPOPT --bcast $IPROOTBCAST \ + $_CHBIND_COMPAT --silent $IPOPT --bcast $IPROOTBCAST \ $_CHCONTEXT_COMPAT $CAPS --secure --silent --ctx $S_CONTEXT \ $_VSERVERKILLALL fi @@ -704,7 +704,7 @@ elif [ "$2" = "suexec" ] ; then cd $__DEFAULT_VSERVERDIR/$VSERVER IPOPT=`setipopt $IPROOT` export PATH=$DEFAULTPATH - exec $_CHBIND $SILENT $IPOPT --bcast $IPROOTBCAST \ + exec $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \ $_CHCONTEXT_COMPAT $SILENT $FLAGS $CAPS --secure --ctx $S_CONTEXT \ $_CAPCHROOT --suid $USERID . "$@" else @@ -726,7 +726,7 @@ elif [ "$2" = "suexec" ] ; then cd $__DEFAULT_VSERVERDIR/$VSERVER IPOPT=`setipopt $IPROOT` export PATH=$DEFAULTPATH - exec $_CHBIND $SILENT $IPOPT --bcast $IPROOTBCAST \ + exec $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \ $_CHCONTEXT_COMPAT $SILENT $FLAGS $CAPS --secure $CTXOPT $HOSTOPT $DOMAINOPT \ $_SAVE_S_CONTEXT $__PKGSTATEDIR/$VSERVER.ctx \ $_CAPCHROOT --suid $USERID $CHROOTOPT . "$@" diff --git a/scripts/vserver.start b/scripts/vserver.start index 8b33dac..3ba7fb6 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -152,7 +152,7 @@ else fi ${NICE_CMD[@]} \ - $_CHBIND "${CHBIND_OPTS[@]}" \ + $_CHBIND_COMPAT "${CHBIND_OPTS[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \ $_SAVE_CTXINFO "$VSERVER_DIR" \