diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 02:44:20 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 02:44:20 +0100 |
commit | 8c9b11aed2c2eb9ad3a77f821efeabb48f848e31 (patch) | |
tree | e6c423e4046cb76c6a61dbc157d313dd7c5822a6 /vnamespace.netns | |
parent | 29fc7eb1549de7622dc1f9fbbfe647b55adace17 (diff) | |
parent | 40f8ecbf261c8b3319350e681a207ed4b42f424d (diff) | |
download | util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.tar.gz util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.tar.bz2 util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.zip |
Merge commit '2.3' into debian
* commit '2.3':
Add insserv config to define $util-vserver system facility.
Add util-vserver-netns initscript.
Use spline-netns folder, to not collidate with default netns handling.
Add vshelper with netns support.
Use nullglob for all globbings.
Diffstat (limited to 'vnamespace.netns')
-rwxr-xr-x | vnamespace.netns | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vnamespace.netns b/vnamespace.netns index d2935f8..57e8881 100755 --- a/vnamespace.netns +++ b/vnamespace.netns @@ -35,7 +35,7 @@ do esac done -if [[ -n "$VSERVER_NAME" && -d "${VSERVER_DIR}/netns/" ]]; then +if [[ -n "$VSERVER_NAME" && -d "${VSERVER_DIR}/spline-netns/" ]]; then exec $_IP netns exec "$VSERVER_NAME" /usr/sbin/vnamespace "${ARGS[@]}" fi |