X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2b8587722d707e88dbc8d381a74c12c380c6db04..7c8c99715d23af5678bbc8ded629f06202648025:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 60c98ea3..99afb75d 100644
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -12,7 +12,7 @@ class Network:
 		# fixme using interfaces.tmp instead of interfaces for now
 		fp = file('/etc/network/interfaces', 'w')
 		fp.write("auto eth0\n")
-		if (config.network.dhcp.value == "yes"):
+		if (config.network.dhcp.value == _("yes")):
 			fp.write("iface eth0 inet dhcp\n")
 		else:
 			fp.write("iface eth0 inet static\n")
@@ -78,6 +78,7 @@ class Network:
 	def activateNetworkConfig(self):
 		import os
 		os.system("/etc/init.d/networking restart")
+		config.network.ip.value = self.getCurrentIP()
 		
 	def setDHCP(self, useDHCP):
 		if (useDHCP):
@@ -118,20 +119,25 @@ class Network:
 		#os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))		
 		#self.writeNetworkConfig()		
 
+	def getCurrentIP(self):
+		ipstr = [0,0,0,0]
+		for x in os.popen("ifconfig eth0 | grep 'inet addr:'", "r").readline().split(' '):
+			if x.split(':')[0] == "addr":
+				ipstr = x.split(':')[1].split('.')
+		ip = []
+		for x in ipstr:
+			ip.append(int(x))
+		print "[Network.py] got ip " + str(ip)
+		return ip
 
 iNetwork = Network()
 
 def InitNetwork():
-	try:
-		ip = [0, 0, 0, 0]
-		print gethostbyname(gethostname())
-		ip = gethostbyname(gethostname()).split('.')
-		print ip
-	except:
-		print "[Network.py] Could not get current ip (not necessarily an error)"
+	ip = iNetwork.getCurrentIP()
+
 		
 	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"), _("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"))