diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 03:57:38 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 03:57:38 +0100 |
| commit | 5e8e9ddc4016a62ec771185c1ffa7dca740677b1 (patch) | |
| tree | 94cd9a5e73a41854019b22e6f8bfa3c046b90aa9 | |
| parent | 40f8ecbf261c8b3319350e681a207ed4b42f424d (diff) | |
| download | util-vserver-netns-5e8e9ddc4016a62ec771185c1ffa7dca740677b1.tar.gz util-vserver-netns-5e8e9ddc4016a62ec771185c1ffa7dca740677b1.tar.bz2 util-vserver-netns-5e8e9ddc4016a62ec771185c1ffa7dca740677b1.zip | |
Unset nullglob after using it.2.4
Nullglob breaks unsetting of array element in util-vserver core,
so we need to unset it, after we use it.
| -rw-r--r-- | vserver.functions | 1 | ||||
| -rwxr-xr-x | vserver.netns | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/vserver.functions b/vserver.functions index 458d8fb..1f68e08 100644 --- a/vserver.functions +++ b/vserver.functions @@ -110,6 +110,7 @@ function _generateInterfaceOptions() { _netnsProcessSingleGateway "$net" netns=1 done + shopt -u nullglob # if using netns, automatically add localhost [ "$netns" != "0" ] && _netnsAddLocalhost "$VSERVER_DIR" diff --git a/vserver.netns b/vserver.netns index ce7bb52..6ad930d 100755 --- a/vserver.netns +++ b/vserver.netns @@ -96,6 +96,7 @@ if [[ "$ACTION" == "start" && -n "${_USE_NETNS}" ]]; then _processSingleNetwork add "$net" done + shopt -u nullglob fi if [[ "$ACTION" == "start" || @@ -144,6 +145,7 @@ if [ -n "${_USE_NETNS}" ]; then _processSingleNetwork remove "$net" done + shopt -u nullglob procs="$($_IP netns exec "$VSERVER_NAME" netstat -tulpenW | sed '1d;2d')" if [ -n "$procs" ]; then |