From: Enrico Scholz Date: Thu, 29 Jan 2004 11:03:09 +0000 (+0000) Subject: fixed/changed path-detection for $UTIL_VSERVER_VARS X-Git-Tag: VERSION_0_10~821 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aa4164f68b34f283ff8878de3d6a5b9ea4faea6;p=util-vserver.git fixed/changed path-detection for $UTIL_VSERVER_VARS git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@723 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/legacy/distrib-info b/util-vserver/scripts/legacy/distrib-info index cccced8..9103cb3 100755 --- a/util-vserver/scripts/legacy/distrib-info +++ b/util-vserver/scripts/legacy/distrib-info @@ -25,7 +25,7 @@ # distrib-info vserver1 pkgversion # If vserver1 is a redhat system, it executes # rpm -qa --queryformat "%{name}=%{version}-%{release} -: ${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..." exit 1 diff --git a/util-vserver/scripts/legacy/vserver b/util-vserver/scripts/legacy/vserver index ea7d84d..dc73472 100755 --- a/util-vserver/scripts/legacy/vserver +++ b/util-vserver/scripts/legacy/vserver @@ -19,7 +19,7 @@ # This is a script to control a virtual server -: ${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..." exit 1 diff --git a/util-vserver/scripts/legacy/vserverkillall b/util-vserver/scripts/legacy/vserverkillall index f49f339..1cf0f43 100755 --- a/util-vserver/scripts/legacy/vserverkillall +++ b/util-vserver/scripts/legacy/vserverkillall @@ -20,7 +20,7 @@ # This script kills all process it can finds # Only useful if you are using a security context. # It does nothing in context 0 -USR_LIB_VSERVER=$(dirname $0) +USR_LIB_VSERVER=/usr/lib/util-vserver CTX=`grep ^s_context /proc/self/status | sed s/s_context:// | (read a b; echo $a)` CTX=`eval expr $CTX + 0` if [ "$CTX" = 0 ] ; then diff --git a/util-vserver/scripts/rootshell b/util-vserver/scripts/rootshell index d7203b1..c0cfca7 100755 --- a/util-vserver/scripts/rootshell +++ b/util-vserver/scripts/rootshell @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -: ${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..." exit 1 diff --git a/util-vserver/scripts/vapt-get b/util-vserver/scripts/vapt-get index b4c0b5d..2c73853 100755 --- a/util-vserver/scripts/vapt-get +++ b/util-vserver/scripts/vapt-get @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -: ${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..." exit 1 diff --git a/util-vserver/scripts/vapt-get-worker b/util-vserver/scripts/vapt-get-worker index f43924f..2a60ea0 100755 --- a/util-vserver/scripts/vapt-get-worker +++ b/util-vserver/scripts/vapt-get-worker @@ -18,7 +18,7 @@ set -e -: ${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..." exit 1 diff --git a/util-vserver/scripts/vpkg b/util-vserver/scripts/vpkg index 4bfd6b6..5eecaba 100755 --- a/util-vserver/scripts/vpkg +++ b/util-vserver/scripts/vpkg @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -: ${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..." exit 1 diff --git a/util-vserver/scripts/vpstree b/util-vserver/scripts/vpstree index 66538b6..506e518 100755 --- a/util-vserver/scripts/vpstree +++ b/util-vserver/scripts/vpstree @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #Presents the processes running in all virtual servers -: ${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..." exit 1 diff --git a/util-vserver/scripts/vrpm b/util-vserver/scripts/vrpm index a49d750..f4f571b 100755 --- a/util-vserver/scripts/vrpm +++ b/util-vserver/scripts/vrpm @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -: ${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..." exit 1 diff --git a/util-vserver/scripts/vrpm-preload b/util-vserver/scripts/vrpm-preload index c5ef7d8..59d8d9d 100755 --- a/util-vserver/scripts/vrpm-preload +++ b/util-vserver/scripts/vrpm-preload @@ -18,7 +18,7 @@ set -e -: ${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..." exit 1 diff --git a/util-vserver/scripts/vrpm-worker b/util-vserver/scripts/vrpm-worker index 1e99104..a32e47b 100755 --- a/util-vserver/scripts/vrpm-worker +++ b/util-vserver/scripts/vrpm-worker @@ -18,7 +18,7 @@ set -e -: ${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..." exit 1 diff --git a/util-vserver/scripts/vserver b/util-vserver/scripts/vserver index 3bcbbc5..b23785c 100755 --- a/util-vserver/scripts/vserver +++ b/util-vserver/scripts/vserver @@ -18,7 +18,7 @@ # set -e -: ${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..." exit 1 diff --git a/util-vserver/scripts/vserver-build b/util-vserver/scripts/vserver-build index 4355d67..a177e63 100755 --- a/util-vserver/scripts/vserver-build +++ b/util-vserver/scripts/vserver-build @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -: ${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..." exit 1 diff --git a/util-vserver/scripts/vserver-copy b/util-vserver/scripts/vserver-copy index c98cd48..8c96ad6 100755 --- a/util-vserver/scripts/vserver-copy +++ b/util-vserver/scripts/vserver-copy @@ -36,7 +36,7 @@ # used so that if/when you reboot the source roothost you don't have the # same vserver and IP address running on two machines. -: ${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..." exit 1 diff --git a/util-vserver/scripts/vservers.grabinfo.sh b/util-vserver/scripts/vservers.grabinfo.sh index 8eab64b..b76e33b 100644 --- a/util-vserver/scripts/vservers.grabinfo.sh +++ b/util-vserver/scripts/vservers.grabinfo.sh @@ -18,7 +18,7 @@ # Produce some XML statistics about vservers -: ${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..." exit 1 diff --git a/util-vserver/scripts/vsysvwrapper b/util-vserver/scripts/vsysvwrapper index d06153a..5d36abd 100755 --- a/util-vserver/scripts/vsysvwrapper +++ b/util-vserver/scripts/vsysvwrapper @@ -18,7 +18,7 @@ # 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..." exit 1 diff --git a/util-vserver/scripts/vtop b/util-vserver/scripts/vtop index 839434b..e6e2198 100755 --- a/util-vserver/scripts/vtop +++ b/util-vserver/scripts/vtop @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #Presents the processes running in all virtual servers -: ${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..." exit 1