From d721f910b13e71fa1c39afdc2b43d9058d9899f8 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 8 Feb 2015 23:59:46 +0100 Subject: Use spline-netns folder, to not collidate with default netns handling. --- vserver.netns | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vserver.netns') diff --git a/vserver.netns b/vserver.netns index 9f78306..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 @@ -90,7 +90,7 @@ if [[ "$ACTION" == "start" && -n "${_USE_NETNS}" ]]; then $_IP netns exec "$VSERVER_NAME" $_IP link set dev lo up shopt -s nullglob - for net in "$VSERVER_DIR/netns/"*; do + for net in "$VSERVER_DIR/spline-netns/"*; do test -d "$net" || continue test ! -e "${net}/disabled" || continue @@ -138,7 +138,7 @@ ret=$? if [ -n "${_USE_NETNS}" ]; then shopt -s nullglob - for net in "${VSERVER_DIR}/netns/"*; do + for net in "${VSERVER_DIR}/spline-netns/"*; do test -d "$net" || continue test ! -e "${net}/disabled" || continue -- cgit v1.2.3-1-g7c22