From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Feb 2009 20:24:08 +0000 (+0100)
Subject: We use ifup/ifdown in brup/brdown.
X-Git-Tag: v3.0-alpha1~33^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d93b1ba5c42fa7adf347a7effad150cfc45c387;p=ipfire-3.x.git

We use ifup/ifdown in brup/brdown.
---

diff --git a/src/initscripts/networking/brdown b/src/initscripts/networking/brdown
index 06b8ecad2..68a005f4e 100644
--- a/src/initscripts/networking/brdown
+++ b/src/initscripts/networking/brdown
@@ -40,7 +40,7 @@ for file in ${FILES}; do
 	fi
 
 	# place interfaces at last position
-	if [[ "${file}" =~ "^nic" ]]; then
+	if [[ "${file}" =~ "^[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]$" ]]; then
 		FILES2="${FILES2} ${file}"
 		continue
 	fi
@@ -51,26 +51,14 @@ done
 FILES=${FILES2}
 
 # Process each configuration file
+export BRIDGE_DOWN=1
 for file in ${FILES}; do
 	if [ ! -f "${file}" ]; then
 		log_warning_msg
 		message="${file} is not a network configuration file or directory."
 		log_warning_msg
 	fi
-
-	(
-		. ${file}
-
-		if [ -n "${SERVICE}" -a -x "${NETWORK_SCRIPTS}/services/${SERVICE}" ]; then
-			IFCONFIG=${file} ${NETWORK_SCRIPTS}/services/${SERVICE} ${1} down
-		else
-			echo -e "${FAILURE}Unable to process ${file}.  Either"
-			echo -e "${FAILURE}the SERVICE variable was not set,"
-			echo -e "${FAILURE}or the specified service cannot be executed."
-			message=""
-			log_failure_msg
-		fi
-	)
+	/etc/init.d/networking/ifdown ${file}
 done
 
 if [ -z "${2}" ]; then
diff --git a/src/initscripts/networking/brup b/src/initscripts/networking/brup
index d163dd0fc..03afe7232 100644
--- a/src/initscripts/networking/brup
+++ b/src/initscripts/networking/brup
@@ -40,7 +40,7 @@ for file in ${FILES}; do
 	fi
 
 	# place interfaces at first position
-	if [[ "${file}" =~ "^nic" ]]; then
+	if [[ "${file}" =~ "^[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]\:[0-9a-f][0-9a-f]$" ]]; then
 		FILES2="${file} ${FILES2}"
 		continue
 	fi
@@ -64,24 +64,13 @@ else
 	log_warning_msg
 fi
 
+# Process each configuration file
+export BRIDGE_UP=1
 for file in ${FILES}; do
 	if [ ! -f "${file}" ]; then
 		log_warning_msg
 		message="${file} is not a network configuration file or directory."
 		log_warning_msg
 	fi
-
-	(
-		. ${file}
-
-		if [ -n "${SERVICE}" -a -x "${NETWORK_SCRIPTS}/services/${SERVICE}" ]; then
-			IFCONFIG=${file} ${NETWORK_SCRIPTS}/services/${SERVICE} ${1} up
-		else
-			echo -e "${FAILURE}Unable to process ${file}.  Either"
-			echo -e "${FAILURE}the SERVICE variable was not set,"
-			echo -e "${FAILURE}or the specified service cannot be executed."
-			message=""
-			log_failure_msg
-		fi
-	)
+	/etc/init.d/networking/ifup ${file}
 done