X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/17e4d31f3f50abb51fa35bcfdfd04cfc73469d36..dbe120313d2b4589e3c7ebe49ee98586a2b04e16:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 365e15f0..7d6c5e17 100644
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -11,22 +11,21 @@ class Network:
 		# 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', 'w')
+		fp.write("auto lo\n")
+		fp.write("iface lo inet loopback\n\n")
 		fp.write("auto eth0\n")
-		if (config.network.dhcp.value == 1):
+		if (currentConfigSelectionElement(config.network.dhcp) == "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))
+			fp2 = file('/etc/resolv.conf', 'w')
+			fp2.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
+			fp2.close()
 		fp.close()
 
-		if config.network.dhcp.value == 0:
-			fp = file('/etc/resolv.conf', 'w')
-			fp.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
-			fp.close()		
-
-
 	def loadNetworkConfig(self):
 		try:
 			# parse the interfaces-file
@@ -58,15 +57,15 @@ class Network:
 			resolv = fp.readlines()
 			fp.close()
 		except:
-			pass
+			print "[Network.py] loading network files failed"
 			
 		try:
 			for i in resolv:
 				split = i.strip().split(' ')
 				if (split[0] == "nameserver"):
-					config.network.nameserver.value = map(int, split[1].split('.'))
+					config.network.dns.value = map(int, split[1].split('.'))
 		except:
-			pass
+			print "[Network.py] resolv.conf parsing failed"
 		
 		try:
 			# set this config
@@ -79,7 +78,7 @@ class Network:
 				if (ifaces["eth0"].has_key("netmask")): config.network.netmask.value = ifaces["eth0"]["netmask"]
 				if (ifaces["eth0"].has_key("gateway")): config.network.gateway.value = ifaces["eth0"]["gateway"]
 		except:
-			pass
+			print "[Network.py] parsing network failed"
 
 	def activateNetworkConfig(self):
 		import os
@@ -143,7 +142,7 @@ def InitNetwork():
 
 		
 	config.network = ConfigSubsection()
-	config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, (_("no"), _("yes")))
+	config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, (("no", _("no")), ("yes", _("yes"))))
 	config.network.ip = configElement_nonSave("config.network.ip", configSequence, ip, configsequencearg.get("IP"))
 	config.network.netmask = configElement_nonSave("config.network.netmask", configSequence, [255,255,255,0], configsequencearg.get("IP"))
 	config.network.gateway = configElement_nonSave("config.network.gateway", configSequence, [192,168,1,3], configsequencearg.get("IP"))