From ec354de1f1785546867974aa5734318f2b1e809f Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Wed, 21 May 2014 17:19:48 +0200
Subject: adjust paths/variables for new util-vserver version

---
 util-vserver-vars | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'util-vserver-vars')

diff --git a/util-vserver-vars b/util-vserver-vars
index 5ef1a1a..4d23588 100644
--- a/util-vserver-vars
+++ b/util-vserver-vars
@@ -1,4 +1,4 @@
-: ${REAL_UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
+: ${REAL_UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
 test -e "$REAL_UTIL_VSERVER_VARS" || {
     echo $"Can not find util-vserver installation (the file '$REAL_UTIL_VSERVER_VARS' would be expected); aborting..." >&2
     exit 1
@@ -6,15 +6,15 @@ test -e "$REAL_UTIL_VSERVER_VARS" || {
 . "$REAL_UTIL_VSERVER_VARS"
 
 # save defaults
-__REAL_PKGLIBDIR="${__PKGLIBDIR}"
+_REAL_LIB_VSERVER_FUNCTIONS="${_LIB_VSERVER_FUNCTIONS}"
 _REAL_VSERVER="${_VSERVER}"
 
 case "$0" in
     /usr/sbin/vserver*)
         # we want to wrap a function from vserver.functions
         # so we want to wrap vserver.functions that will be include with:
-        # . $__PKGLIBDIR/vserver.functions
-        __PKGLIBDIR="${__PKGLIBDIR}/netns"
+        # . ${_LIB_VSERVER_FUNCTIONS}
+        _LIB_VSERVER_FUNCTIONS="$__PKGDATADIR/netns/vserver.functions"
         ;;
 
     *)
-- 
cgit v1.2.3-1-g7c22