diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 03:59:02 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 03:59:02 +0100 |
| commit | b761505c1c454f429ce80a99e062d9aa3907996f (patch) | |
| tree | 6682047c68f784cf5076f0046641d1e06e5efe41 | |
| parent | 92db241a57ded41195e16d1aecc108d25f7d99ff (diff) | |
| parent | 5e8e9ddc4016a62ec771185c1ffa7dca740677b1 (diff) | |
| download | util-vserver-netns-b761505c1c454f429ce80a99e062d9aa3907996f.tar.gz util-vserver-netns-b761505c1c454f429ce80a99e062d9aa3907996f.tar.bz2 util-vserver-netns-b761505c1c454f429ce80a99e062d9aa3907996f.zip | |
Merge branch 'master' into debian
* master:
Unset nullglob after using 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 |