aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorArturo FilastoĢ€ <hellais@torproject.org>2011-08-23 16:03:21 +0200
committerArturo FilastoĢ€ <hellais@torproject.org>2011-08-23 16:03:21 +0200
commite09646bce65198fdc6dc13ca94b6653059c7ae0b (patch)
treec1bafeb3e172de6499909634561432e553c1524f /packages
parent74e568fc3ca899b202e839a31ec166f8f8c528c8 (diff)
downloadtorouter-e09646bce65198fdc6dc13ca94b6653059c7ae0b.tar.gz
torouter-e09646bce65198fdc6dc13ca94b6653059c7ae0b.zip
Use wlan0 instead of uap0
Diffstat (limited to 'packages')
-rw-r--r--packages/torouter-web/src/tui/controllers/network.py2
-rw-r--r--packages/torouter-web/src/tui/utils/parsing.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py
index 690dc3f..6b62da7 100644
--- a/packages/torouter-web/src/tui/controllers/network.py
+++ b/packages/torouter-web/src/tui/controllers/network.py
@@ -81,7 +81,7 @@ class wireless:
itfc.set_mac(data.mac)
itfc.wifi['netmask'] = data.netmask
itfc.wifi['address'] = data.address
- filecontent = itfc.exclude_output("uap0") + itfc.output(itfc.wifi)
+ filecontent = itfc.exclude_output("wlan0") + itfc.output(itfc.wifi)
files = [('/etc/network/interfaces', filecontent)]
fileio.write(files)
#print itfc.output(itfc.wifi)
diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py
index b4dbaee..4d52c87 100644
--- a/packages/torouter-web/src/tui/utils/parsing.py
+++ b/packages/torouter-web/src/tui/utils/parsing.py
@@ -27,7 +27,7 @@ class interfaces:
def parse_line(self, line, iface):
name = line.split(" ")[0]
values = " ".join(line.split(" ")[1:]).rstrip()
- if iface == "uap0":
+ if iface == "wlan0":
if self.wifi.has_key(name):
if type(self.wifi[name]) is list:
self.wifi[name].append(values)
@@ -99,7 +99,7 @@ class interfaces:
# XXX currently works for one pre-up entry, must make it work also for arrays
def set_mac(self, mac):
- self.wifi['pre-up'] = 'ifconfig uap0 hw ether ' + mac
+ self.wifi['pre-up'] = 'ifconfig wlan0 hw ether ' + mac
class torrc: