summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2015-02-01 23:36:20 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2015-02-01 23:36:20 +0100
commit69e779e3c1893c3d08dee98781e6b8ce9bbb81c1 (patch)
treeaaf2081e39fda964c9fa657e5029b8bdbc034e59
parente6fb276b72ecd9fbc7be35ff56f471ca00566236 (diff)
downloadutil-vserver-netns-69e779e3c1893c3d08dee98781e6b8ce9bbb81c1.tar.gz
util-vserver-netns-69e779e3c1893c3d08dee98781e6b8ce9bbb81c1.tar.bz2
util-vserver-netns-69e779e3c1893c3d08dee98781e6b8ce9bbb81c1.zip
Use nullglob for all globbings.
-rw-r--r--vserver.functions1
-rwxr-xr-xvserver.netns2
2 files changed, 3 insertions, 0 deletions
diff --git a/vserver.functions b/vserver.functions
index 97e7b35..f35cf0c 100644
--- a/vserver.functions
+++ b/vserver.functions
@@ -102,6 +102,7 @@ function _generateInterfaceOptions() {
# add commands for default route
local netns=0
+ shopt -s nullglob
for net in "$VSERVER_DIR/netns/"*; do
test -d "$net" || continue
test ! -e "${net}/disabled" || continue
diff --git a/vserver.netns b/vserver.netns
index 6b7526a..9f78306 100755
--- a/vserver.netns
+++ b/vserver.netns
@@ -89,6 +89,7 @@ if [[ "$ACTION" == "start" && -n "${_USE_NETNS}" ]]; then
$_IP netns list | grep -q "^${VSERVER_NAME}\$" || $_IP netns add "$VSERVER_NAME"
$_IP netns exec "$VSERVER_NAME" $_IP link set dev lo up
+ shopt -s nullglob
for net in "$VSERVER_DIR/netns/"*; do
test -d "$net" || continue
test ! -e "${net}/disabled" || continue
@@ -136,6 +137,7 @@ fi
ret=$?
if [ -n "${_USE_NETNS}" ]; then
+ shopt -s nullglob
for net in "${VSERVER_DIR}/netns/"*; do
test -d "$net" || continue
test ! -e "${net}/disabled" || continue