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

---
 Makefile          | 6 +++---
 util-vserver-vars | 8 ++++----
 vnamespace.netns  | 4 ++--
 vserver.functions | 4 ++--
 vserver.netns     | 4 ++--
 vservers-default  | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index c869fb3..9d07b8b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,15 @@ all:
 clean:
 
 install: vserver.netns vnamespace.netns util-vserver-vars vserver.functions vserver-netns.sh vservers-default
-	install -d "$(DESTDIR)/usr/lib/util-vserver/netns/" \
+	install -d "$(DESTDIR)/usr/share/util-vserver/netns/" \
 		"$(DESTDIR)/usr/sbin/" \
 		"$(DESTDIR)/etc/profile.d/" \
 		"$(DESTDIR)/etc/default/"
 
 	install vserver.netns "$(DESTDIR)/usr/sbin/"
 	install vnamespace.netns "$(DESTDIR)/usr/sbin/"
-	install -m644 util-vserver-vars "$(DESTDIR)/usr/lib/util-vserver/netns/"
-	install -m644 vserver.functions "$(DESTDIR)/usr/lib/util-vserver/netns/"
+	install -m644 util-vserver-vars "$(DESTDIR)/usr/share/util-vserver/netns/"
+	install -m644 vserver.functions "$(DESTDIR)/usr/share/util-vserver/netns/"
 	install -m644 vserver-netns.sh "$(DESTDIR)/etc/profile.d/"
 	install -m644 vservers-default "$(DESTDIR)/etc/default/"
 .PHONY: install		
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"
         ;;
 
     *)
diff --git a/vnamespace.netns b/vnamespace.netns
index 9d34a36..d2935f8 100755
--- a/vnamespace.netns
+++ b/vnamespace.netns
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/netns/util-vserver-vars}
+: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/netns/util-vserver-vars}
 test -e "$UTIL_VSERVER_VARS" || {
     echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
     exit 1
 }
 . "$UTIL_VSERVER_VARS"
 . "$_LIB_FUNCTIONS"
-. $__PKGLIBDIR/vserver.functions
+. "$_LIB_VSERVER_FUNCTIONS"
 
 ARGS=( "$@" )
 
diff --git a/vserver.functions b/vserver.functions
index 8c25f74..cd2cf9d 100644
--- a/vserver.functions
+++ b/vserver.functions
@@ -1,6 +1,6 @@
 # source the real file
-. ${__REAL_PKGLIBDIR}/vserver.functions
-__PKGLIBDIR="${__REAL_PKGLIBDIR}"
+. ${_REAL_LIB_VSERVER_FUNCTIONS}
+_REAL_LIB_VSERVER_FUNCTIONS="${_REAL_LIB_VSERVER_FUNCTIONS}"
 
 #
 # own functions
diff --git a/vserver.netns b/vserver.netns
index c507621..5f66941 100755
--- a/vserver.netns
+++ b/vserver.netns
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/netns/util-vserver-vars}
+: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/netns/util-vserver-vars}
 test -e "$UTIL_VSERVER_VARS" || {
     echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
     exit 1
 }
 . "$UTIL_VSERVER_VARS"
 . "$_LIB_FUNCTIONS"
-. $__PKGLIBDIR/vserver.functions
+. "$_LIB_VSERVER_FUNCTIONS"
 
 function _processSingleNetwork() {
     local dev
diff --git a/vservers-default b/vservers-default
index b802b61..a09b8df 100644
--- a/vservers-default
+++ b/vservers-default
@@ -4,8 +4,8 @@
 # so that we can fire up our modified version of the vserver
 # script and do the network namespace setup stuff even for
 # vservers that get started up during boot.
-if [ -r "/usr/lib/util-vserver/netns/util-vserver-vars" ]; then
-    UTIL_VSERVER_VARS="/usr/lib/util-vserver/netns/util-vserver-vars"
+if [ -r "/usr/share/util-vserver/netns/util-vserver-vars" ]; then
+    UTIL_VSERVER_VARS="/usr/share/util-vserver/netns/util-vserver-vars"
     export UTIL_VSERVER_VARS
 fi
 
-- 
cgit v1.2.3-1-g7c22