From: acid-burn <acid-burn@opendreambox.org>
Date: Thu, 17 Mar 2011 08:50:12 +0000 (+0100)
Subject: Merge remote branch 'origin/acid-burn/networking_changes'
X-Git-Tag: 3.1.0~2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/35b79c13bc95e26dfae5cb1cda2eef2f265ad9db?hp=2404d9d809e8c9704383c85475f50b0be55949a7

Merge remote branch 'origin/acid-burn/networking_changes'
---

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 0a011236..04511d25 100755
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -88,7 +88,7 @@ class Network:
 
 	def IPaddrFinished(self, result, retval, extra_args):
 		(iface, callback ) = extra_args
-		data = { 'up': False, 'dhcp': False, 'preup' : False, 'postdown' : False }
+		data = { 'up': False, 'dhcp': False, 'preup' : False, 'predown' : False }
 		globalIPpattern = re_compile("scope global")
 		ipRegexp = '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'
 		netRegexp = '[0-9]{1,2}'
@@ -174,7 +174,8 @@ class Network:
 				fp.write(iface["configStrings"])
 			if iface["preup"] is not False and not iface.has_key("configStrings"):
 				fp.write(iface["preup"])
-				fp.write(iface["postdown"])
+			if iface["predown"] is not False and not iface.has_key("configStrings"):
+				fp.write(iface["predown"])
 			fp.write("\n")
 		fp.close()
 		self.writeNameserverConfig()
@@ -225,9 +226,9 @@ class Network:
 				if (split[0] == "pre-up"):
 					if self.ifaces[currif].has_key("preup"):
 						self.ifaces[currif]["preup"] = i
-				if (split[0] == "post-down"):
-					if self.ifaces[currif].has_key("postdown"):
-						self.ifaces[currif]["postdown"] = i
+				if (split[0] in ("pre-down","post-down")):
+					if self.ifaces[currif].has_key("predown"):
+						self.ifaces[currif]["predown"] = i
 
 		for ifacename, iface in ifaces.items():
 			if self.ifaces.has_key(ifacename):