projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f5ebc2d
)
[NetworkSetup] update ifaces before create setup.
author
hschang
<chang@dev3>
Thu, 27 Sep 2018 07:09:19 +0000
(16:09 +0900)
committer
hschang
<chang@dev3>
Thu, 27 Sep 2018 07:09:19 +0000
(16:09 +0900)
lib/python/Screens/NetworkSetup.py
patch
|
blob
|
history
diff --git
a/lib/python/Screens/NetworkSetup.py
b/lib/python/Screens/NetworkSetup.py
index
e5eb740
..
5e85df8
100755
(executable)
--- a/
lib/python/Screens/NetworkSetup.py
+++ b/
lib/python/Screens/NetworkSetup.py
@@
-313,8
+313,6
@@
class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
self.oktext = _("Press OK on your remote control to continue.")
self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up")
self.oktext = _("Press OK on your remote control to continue.")
self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up")
- self.createConfig()
-
self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
{
"cancel": (self.keyCancel, _("exit network adapter configuration")),
self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
{
"cancel": (self.keyCancel, _("exit network adapter configuration")),
@@
-333,7
+331,6
@@
class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
self.list = []
ConfigListScreen.__init__(self, self.list,session = self.session)
self.list = []
ConfigListScreen.__init__(self, self.list,session = self.session)
- self.createSetup()
self.onLayoutFinish.append(self.layoutFinished)
self.onClose.append(self.cleanup)
self.onLayoutFinish.append(self.layoutFinished)
self.onClose.append(self.cleanup)
@@
-361,7
+358,14
@@
class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
self["HelpWindow"] = Pixmap()
self["HelpWindow"].hide()
self["HelpWindow"] = Pixmap()
self["HelpWindow"].hide()
- def layoutFinished(self):
+ def updateInterfaces(self,callback = None):
+ iNetwork.config_ready = False
+ iNetwork.msgPlugins()
+ iNetwork.getInterfaces(callback)
+
+ def updateInterfaceCB(self, ret=None):
+ self.createConfig()
+ self.createSetup()
self["DNS1"].setText(self.primaryDNS.getText())
self["DNS2"].setText(self.secondaryDNS.getText())
if self.ipConfigEntry.getText() is not None:
self["DNS1"].setText(self.primaryDNS.getText())
self["DNS2"].setText(self.secondaryDNS.getText())
if self.ipConfigEntry.getText() is not None:
@@
-390,6
+394,9
@@
class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
self["Gatewaytext"].setText("")
self["Adapter"].setText(iNetwork.getFriendlyAdapterName(self.iface))
self["Gatewaytext"].setText("")
self["Adapter"].setText(iNetwork.getFriendlyAdapterName(self.iface))
+ def layoutFinished(self):
+ self.updateInterfaces(self.updateInterfaceCB)
+
def createConfig(self):
self.InterfaceEntry = None
self.dhcpEntry = None
def createConfig(self):
self.InterfaceEntry = None
self.dhcpEntry = None