From a31c7a30dced003c0f96025fa76364eb523e832c Mon Sep 17 00:00:00 2001
From: Florian La Roche <laroche@redhat.com>
Date: Fri, 18 Apr 2003 21:09:07 +0000
Subject: - new release

---
 rc.d/init.d/network | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

(limited to 'rc.d/init.d/network')

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 36d06a77..333c38d8 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -111,45 +111,22 @@ case "$1" in
 			is_available $i
 			continue
 		fi
-		# If we're in confirmation mode, get user confirmation
-		[ -n "$CONFIRM" ]  && 
-			{ 
-			    confirm $i
-			    case $? in
-				0)
-				    :
-				;;
-				2)
-				    CONFIRM=
-				;;
-				*)
-				    continue
-				;;
-			    esac 
-		}
-
+		# If we're in confirmation mode, get user confirmation.
+		if [ -f /var/run/confirm ]; then
+			confirm $i
+			test $? = 1 && continue
+		fi
 		action $"Bringing up interface $i: " ./ifup $i boot
 	done
 	
 	# Bring up CIPE VPN interfaces
 	for i in $cipeinterfaces ; do 
             if ! LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then
-		# If we're in confirmation mode, get user confirmation
-		[ -n "$CONFIRM" ]  && 
-		{ 
+		# If we're in confirmation mode, get user confirmation.
+		if [ -f /var/run/confirm ]; then
 			confirm $i
-			case $? in
-				0)
-				    :
-				;;
-				2)
-				    CONFIRM=
-				;;
-				*)
-				    continue
-				;;
-			esac 
-		}
+			test $? = 1 && continue
+		fi
 		action $"Bringing up interface $i: " ./ifup $i boot
 	    fi
         done
-- 
cgit v1.2.1