Merge remote branch 'origin/acid-burn/networking_changes'
authoracid-burn <acid-burn@opendreambox.org>
Thu, 17 Mar 2011 08:50:12 +0000 (09:50 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 17 Mar 2011 08:50:12 +0000 (09:50 +0100)
lib/python/Components/Network.py

index 0a01123..04511d2 100755 (executable)
@@ -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):