From 95cf3519da76f335389cd7a18d0090b59f81f2e7 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 21 Apr 2004 00:24:48 +0000 Subject: [PATCH] made 'nodev' work git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1486 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver.functions | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 80befc0..c1c9c70 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -455,11 +455,13 @@ function _processSingleInterface echo $"The 'only_ip' flag for interface '$iface' is deprecated; use 'nodev' instead of" >&2 unset dev } - test ! -e "$iface"/nodev || unset dev test ! -e "$iface"/down || up= - if test "$dev"; then + while test "$dev"; do _transformMask2Prefix prefix "$prefix" "$mask" + INTERFACES=( "${INTERFACES[@]}" "$ip${prefix:+/$prefix}" ) + + test ! -e "$iface"/nodev || break case "$dev" in (*.*) @@ -490,8 +492,9 @@ function _processSingleInterface _addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" dev "$dev" test -z "$extip" || _addInterfaceCmd IPTABLES "$ip${prefix:+/$prefix}" ${name:+label "$dev:$name"} "$ctx" "$extip" fi - INTERFACES=( "${INTERFACES[@]}" "$ip${prefix:+/$prefix}" ) - fi + + break + done } ## Usage: _generateInterfaceOptions -- 1.8.1.5