diff options
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/Network.py | 45 | ||||
| -rw-r--r-- | lib/python/Components/config.py | 15 |
2 files changed, 37 insertions, 23 deletions
diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index b74521cd..e56e5c84 100644 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -6,52 +6,62 @@ class Network: def __init__(self): pass + def updateNetworkConfig(self): + # fixme restarting and updating the network too often. possible fix: check current config and execute only if changed :/ + # fixme using interfaces.tmp instead of interfaces for now + fp = file('/etc/network/interfaces.tmp', 'w') + fp.write("auto eth0\n") + if (config.network.dhcp.value == "yes"): + fp.write("iface eth0 inet dhcp\n") + else: + fp.write("iface eth0 inet static\n") + fp.write(" address %d.%d.%d.%d\n" % tuple(config.network.ip.value)) + fp.write(" netmask %d.%d.%d.%d\n" % tuple(config.network.netmask.value)) + fp.write(" gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value)) + fp.close() + + import os + os.system("/etc/init.d/networking restart") + def setDHCP(self, useDHCP): if (useDHCP): print "Using DHCP" config.network.ip.enabled = False + config.network.netmask.enabled = False config.network.gateway.enabled = False config.network.dns.enabled = False else: print "NOT using DHCP" config.network.ip.enabled = True + config.network.netmask.enabled = True config.network.gateway.enabled = True config.network.dns.enabled = True - def setIPAddress(self, ip): - print ip - os.system("echo ifconfig eth0 %d.%d.%d.%d" % (ip[0], ip[1], ip[2], ip[3])) - - def setIPGateway(self, ip): - os.system("echo route add default gw %d.%d.%d.%d" % (ip[0], ip[1], ip[2], ip[3])) - def setIPNameserver(self, ip): resolvconf = file('/etc/resolv.conf', 'w') - resolvconf.write("nameserver %d.%d.%d.%d" % (ip[0], ip[1], ip[2], ip[3])) + resolvconf.write("nameserver %d.%d.%d.%d" % tuple(ip)) resolvconf.close() def setMACAddress(self, mac): - os.system("echo ifconfig eth0 ether %02x:%02x:%02x:%02x:%02x:%02x" % (mac[0], mac[1], mac[2], mac[3], mac[4], mac[5])) + os.system("echo ifconfig eth0 ether %02x:%02x:%02x:%02x:%02x:%02x" % tuple(mac)) def InitNetwork(): config.network = ConfigSubsection() config.network.dhcp = configElement("config.network.dhcp", configSelection, 0, ("no", "yes")) config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], (("."), 3)) + config.network.netmask = configElement("config.network.netmask", configSequence, [255,255,255,0], (("."), 3)) config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], (("."), 3)) config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], (("."), 3)) config.network.mac = configElement("config.network.mac", configSequence, [00,11,22,33,44,55], ((":"), 2)) iNetwork = Network() + def updateNetworkConfig(configElement): + iNetwork.updateNetworkConfig() + def setDHCP(configElement): iNetwork.setDHCP(configElement.value) - def setIPAddress(configElement): - iNetwork.setIPAddress(configElement.value) - - def setIPGateway(configElement): - iNetwork.setIPGateway(configElement.value) - def setIPNameserver(configElement): iNetwork.setIPNameserver(configElement.value) @@ -60,7 +70,8 @@ def InitNetwork(): # this will call the "setup-val" initial config.network.dhcp.addNotifier(setDHCP) - config.network.ip.addNotifier(setIPAddress) - config.network.gateway.addNotifier(setIPGateway) + config.network.ip.addNotifier(updateNetworkConfig) + config.network.netmask.addNotifier(updateNetworkConfig) + config.network.gateway.addNotifier(updateNetworkConfig) config.network.dns.addNotifier(setIPNameserver) config.network.mac.addNotifier(setMACAddress)
\ No newline at end of file diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 1795d426..2fd0ff15 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -128,7 +128,8 @@ class configSequence: if diff > 0: value += " " * diff value += str(i) - +# or the above code if you have to spare ink +# value = ((len(self.parent.value) * ("%0" + str(self.parent.vals[1]) + "d" + self.parent.vals[0]))[0:-1]) % tuple(self.parent.value) value = value[0:mPos] + "_" + value[mPos + 1:] return ("text", value) @@ -203,11 +204,13 @@ class configElement: elif control == configSelection: return str(data); elif control == configSequence: - value = "" - for i in data: - if value !="": - value += self.vals[0] - value += str(i) + value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data) +# just in case you don't understand the above, here an equivalent: +# value = "" +# for i in data: +# if value !="": +# value += self.vals[0] +# value += str(i) return value else: return "" |