From d54760e74574f4fdc37b73f9afc8474e744d8543 Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 16 Jun 2009 20:03:52 +0200 Subject: [PATCH] Modem/plugin.py: also change username in /etc/ppp/options fix actionmap priority --- lib/python/Plugins/Extensions/Modem/plugin.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/python/Plugins/Extensions/Modem/plugin.py b/lib/python/Plugins/Extensions/Modem/plugin.py index edbc5909..e57e4f51 100644 --- a/lib/python/Plugins/Extensions/Modem/plugin.py +++ b/lib/python/Plugins/Extensions/Modem/plugin.py @@ -18,7 +18,7 @@ def getTelephone(): return line return "" -def setTelephone(tel): +def setOptions(tel, user): f = open("/etc/ppp/options", "r+") if f: lines = f.readlines() @@ -29,6 +29,8 @@ def setTelephone(tel): p = line.find(' ', p+1) line = line[:p+1] f.write(line+tel+'"\n') + elif line.find('user') == 0: + f.write('user '+user+'\n') else: f.write(line) @@ -133,7 +135,7 @@ class ModemSetup(Screen): "7": self.keyNumber, "8": self.keyNumber, "9": self.keyNumber - }, 0) + }, -1) self["ListActions"] = ActionMap(["ListboxDisableActions"], { @@ -172,7 +174,7 @@ class ModemSetup(Screen): conn.dataAvail.remove(self.dataAvail) if not connected: conn.sendCtrlC() - setTelephone(self.phone.getText()) + setOptions(self.phone.getText(), self.username.getText()) setSecretString(self.username.getText() + ' * ' + self.password.getText()) def stateLoop(self): @@ -188,7 +190,7 @@ class ModemSetup(Screen): system("route del default") system("modprobe ppp_async"); self.stateTimer.start(1000,False) - setTelephone(self.phone.getText()) + setOptions(self.phone.getText(), self.username.getText()) setSecretString(self.username.getText() + ' * ' + self.password.getText()) ret = conn.execute("pppd", "pppd", "-d", "-detach") if ret: -- 2.30.2