diff options
Diffstat (limited to 'vserver.netns')
| -rwxr-xr-x | vserver.netns | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vserver.netns b/vserver.netns index 6b7526a..ce7bb52 100755 --- a/vserver.netns +++ b/vserver.netns @@ -78,7 +78,7 @@ NETNS=() _setVserverDir "$VSERVER_NAME" -[ -d "${VSERVER_DIR}/netns/" ] && _USE_NETNS="1" +[ -d "${VSERVER_DIR}/spline-netns/" ] && _USE_NETNS="1" if [[ "$ACTION" == "start" && -n "${_USE_NETNS}" ]]; then pushd "$VSERVER_DIR" >/dev/null @@ -89,7 +89,8 @@ 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 - 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 @@ -136,7 +137,8 @@ fi ret=$? if [ -n "${_USE_NETNS}" ]; then - 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 |