diff options
-rwxr-xr-x | vnamespace.netns | 2 | ||||
-rwxr-xr-x | vserver.netns | 2 | ||||
-rw-r--r-- | vservers-default | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vnamespace.netns b/vnamespace.netns index 51c6325..20e9a34 100755 --- a/vnamespace.netns +++ b/vnamespace.netns @@ -1,6 +1,6 @@ #!/bin/bash -: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars.netns} +: ${UTIL_VSERVER_VARS:=/usr/lib/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 diff --git a/vserver.netns b/vserver.netns index a3e81eb..713f6c8 100755 --- a/vserver.netns +++ b/vserver.netns @@ -1,6 +1,6 @@ #!/bin/bash -: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars.netns} +: ${UTIL_VSERVER_VARS:=/usr/lib/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 diff --git a/vservers-default b/vservers-default index 314bfa0..b2ca484 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/util-vserver-vars.netns" ]; then - UTIL_VSERVER_VARS="/usr/lib/util-vserver/util-vserver-vars.netns" +if [ -r "/usr/lib/util-vserver/netns/util-vserver-vars" ]; then + UTIL_VSERVER_VARS="/usr/lib/util-vserver/netns/util-vserver-vars" export UTIL_VSERVER_VARS fi |