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 /vserver.netns | |
| 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 'vserver.netns')
| -rwxr-xr-x | vserver.netns | 4 |
1 files changed, 2 insertions, 2 deletions
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 |