diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-05-21 23:16:09 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-05-21 23:16:09 +0200 |
| commit | 272db225e12ef6a5c8f8be990bdaad24dcc4496f (patch) | |
| tree | 92697e3d643f962011646960d7918f458c3edb22 | |
| parent | 9edde53e727b33d257cdfc1832f5494e05a5cb0f (diff) | |
| parent | e6fb276b72ecd9fbc7be35ff56f471ca00566236 (diff) | |
| download | util-vserver-netns-272db225e12ef6a5c8f8be990bdaad24dcc4496f.tar.gz util-vserver-netns-272db225e12ef6a5c8f8be990bdaad24dcc4496f.tar.bz2 util-vserver-netns-272db225e12ef6a5c8f8be990bdaad24dcc4496f.zip | |
Merge commit '2.2' into debian
* commit '2.2':
vserver.function: disable internal util-vserver netns handling
| -rw-r--r-- | vserver.functions | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vserver.functions b/vserver.functions index cd2cf9d..97e7b35 100644 --- a/vserver.functions +++ b/vserver.functions @@ -140,3 +140,15 @@ function enableInterfaces() { return $ret } + +# +# disable original netns handling +# + +function _handleNetNS() { + # The netns handling of util-vserver activates the netns inside the + # namespace, so the netns is not usable on the host. We have to disable + # the internal handling to use our variant. So we simply overwrite the + # internale function with this no-op. + return 0 +} |