diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-05-21 17:46:37 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-05-21 17:46:37 +0200 |
| commit | 108b4c1ac5bc9a495edd0560676f2e84169d41ec (patch) | |
| tree | 68d39125b249d5d5beafaa9b8571077c1e901a1c /util-vserver-vars | |
| parent | a0d0b3404ae69d18a41a89afdd9a875b65f4ccac (diff) | |
| parent | ec354de1f1785546867974aa5734318f2b1e809f (diff) | |
| download | util-vserver-netns-108b4c1ac5bc9a495edd0560676f2e84169d41ec.tar.gz util-vserver-netns-108b4c1ac5bc9a495edd0560676f2e84169d41ec.tar.bz2 util-vserver-netns-108b4c1ac5bc9a495edd0560676f2e84169d41ec.zip | |
Merge commit '2.0' into debian
* commit '2.0':
adjust paths/variables for new util-vserver version
Diffstat (limited to 'util-vserver-vars')
| -rw-r--r-- | util-vserver-vars | 8 |
1 files changed, 4 insertions, 4 deletions
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" ;; *) |