diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2011-03-17 09:50:12 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2011-03-17 09:50:12 +0100 |
| commit | 35b79c13bc95e26dfae5cb1cda2eef2f265ad9db (patch) | |
| tree | 15df253fca44cc2711835fd46aab8a0b6fba8f7e /lib/python/Components | |
| parent | 2404d9d809e8c9704383c85475f50b0be55949a7 (diff) | |
| parent | 7911822c34874eac5c64bef3fddca0147f53d26b (diff) | |
| download | enigma2-35b79c13bc95e26dfae5cb1cda2eef2f265ad9db.tar.gz enigma2-35b79c13bc95e26dfae5cb1cda2eef2f265ad9db.zip | |
Merge remote branch 'origin/acid-burn/networking_changes'
Diffstat (limited to 'lib/python/Components')
| -rwxr-xr-x | lib/python/Components/Network.py | 11 |
1 files changed, 6 insertions, 5 deletions
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): |