added mac address to network setting menu for testing

diff --git a/data/setup.xml b/data/setup.xml
index a6f5cd2be17fffb5ce75a71ad544f7180a9b15ca..3b92ec61f10b1de49be51523d770d3f37f91ecc6 100644 (file)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -18,7 +18,8 @@
                <setup key="network" title="Networksetup">
                        <item text="IP Address">config.network.ip</item>
                        <item text="Gateway">config.network.gateway</item>
-                       <item text="Nameserver">config.network.dns</item>                                               
+                       <item text="Nameserver">config.network.dns</item>
+                       <item text="MAC Address">config.network.mac</item>
                </setup>
                <setup key="rfmod" title="UHF Modulator">
                        <item text="Modulator">config.rfmod.enable</item>

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index df2c3d9c1916ffeda2b94224f38559345db91378..ab89d3c614936052e0e4a8a5ece8ba291aff299c 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -8,7 +8,7 @@ class Network:
                
        def setIPAddress(self, ip):
                print ip
-               #os.system("echo ifconfig eth0 %d.%d.%d.%d" % (ip[0], ip[1], ip[2], ip[3]))
+               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]))
@@ -18,25 +18,32 @@ class Network:
                resolvconf.write("nameserver %d.%d.%d.%d" % (ip[0], ip[1], ip[2], ip[3]))
                resolvconf.close()
                
+       def setMACAddress(self, mac):
+               os.system("echo ifconfig eth0 %02x:%02x:%02x:%02x:%02x:%02x" % (mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]))
+               
 def InitNetwork():
-       config.network = ConfigSubsection();
-       config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], (".") );
-       config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], (".") );
-       config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], (".") );
+       config.network = ConfigSubsection()
+       config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], ("."))
+       config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], ("."))
+       config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], ("."))
+       config.network.mac = configElement("config.network.mac", configSequence, [00,11,22,33,44,55], (":"))
 
        iNetwork = Network()
 
        def setIPAddress(configElement):
-               iNetwork.setIPAddress(configElement.value);
+               iNetwork.setIPAddress(configElement.value)
 
        def setIPGateway(configElement):
-               iNetwork.setIPGateway(configElement.value);
+               iNetwork.setIPGateway(configElement.value)
                
        def setIPNameserver(configElement):
-               iNetwork.setIPNameserver(configElement.value);
+               iNetwork.setIPNameserver(configElement.value)
 
+       def setMACAddress(configElement):
+               iNetwork.setMACAddress(configElement.value)
 
        # this will call the "setup-val" initial
-       config.network.ip.addNotifier(setIPAddress);
-       config.network.gateway.addNotifier(setIPGateway);
-       config.network.dns.addNotifier(setIPNameserver);                
+       config.network.ip.addNotifier(setIPAddress)
+       config.network.gateway.addNotifier(setIPGateway)
+       config.network.dns.addNotifier(setIPNameserver)
+       config.network.mac.addNotifier(setMACAddress)
\ No newline at end of file

diff --git a/lib/python/Screens/__init__.py b/lib/python/Screens/__init__.py
index f27bdcbcb6e23cb3a9f06c15f871c8f2e0d80c9f..ac85ca44c828ffa629a417fc1fcd05e6c6a5bd11 100644 (file)
--- a/lib/python/Screens/__init__.py
+++ b/lib/python/Screens/__init__.py
@@ -1,4 +1,4 @@
 __all__ = ["ChannelSelection", "ClockDisplay", "ConfigMenu", 
        "InfoBar", "MessageBox", "Menu", "MovieSelection", 
        "ScartLoopThrough", "Screen", "ServiceScan", "About",
-       "TimerEdit", "Network", "Setup", "HarddiskSetup"]
+       "TimerEdit", "Setup", "HarddiskSetup"]