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 /vserver.functions | |
| 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 'vserver.functions')
| -rw-r--r-- | vserver.functions | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vserver.functions b/vserver.functions index 97e7b35..458d8fb 100644 --- a/vserver.functions +++ b/vserver.functions @@ -102,7 +102,8 @@ function _generateInterfaceOptions() { # add commands for default route local netns=0 - for net in "$VSERVER_DIR/netns/"*; do + shopt -s nullglob + for net in "$VSERVER_DIR/spline-netns/"*; do test -d "$net" || continue test ! -e "${net}/disabled" || continue |