From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 11 Oct 2005 23:52:07 +0000 (+0000)
Subject: get network config from /etc/network/interfaces
X-Git-Tag: 2.6.0~5482
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/99603b28da72d3269742be0be6557da8262fc1a0?ds=sidebyside

get network config from /etc/network/interfaces
still missing: parsing of /etc/resolv.conf for nameserver retrieval
---

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 3fc7f0e1..85d0a3a2 100644
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -10,7 +10,7 @@ class Network:
 	def writeNetworkConfig(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 = file('/etc/network/interfaces', 'w')
 		fp.write("auto eth0\n")
 		if (config.network.dhcp.value == "yes"):
 			fp.write("iface eth0 inet dhcp\n")
@@ -21,9 +21,46 @@ class Network:
 			fp.write("	gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
 		fp.close()
 
+	def loadNetworkConfig(self):
+		try:
+			# parse the interfaces-file
+			fp = file('/etc/network/interfaces', 'r')
+			interfaces = fp.readlines()
+			ifaces = {}
+			currif = ""
+			for i in interfaces:
+				split = i.strip().split(' ')
+				if (split[0] == "iface"):
+					currif = split[1]
+					ifaces[currif] = {}
+					if (len(split) == 4 and split[3] == "dhcp"):
+						ifaces[currif]["dhcp"] = "yes"
+					else:
+						ifaces[currif]["dhcp"] = "no"
+				if (currif != ""):
+					if (split[0] == "address"):
+						ifaces[currif]["address"] = map(int, split[1].split('.'))
+					if (split[0] == "netmask"):
+						ifaces[currif]["netmask"] = map(int, split[1].split('.'))
+					if (split[0] == "gateway"):
+						ifaces[currif]["gateway"] = map(int, split[1].split('.'))										
+			
+			# set this config
+			if (ifaces.has_key("eth0")):
+				if (ifaces["eth0"]["dhcp"] == "yes"):
+					config.network.dhcp.value = 1
+				else:
+					config.network.dhcp.value = 0
+				if (ifaces["eth0"].has_key("address")): config.network.ip.value = ifaces["eth0"]["address"]
+				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"]
+			fp.close()
+		except:
+			pass
+
 	def activateNetworkConfig(self):
 		import os
-		#os.system("/etc/init.d/networking restart")
+		os.system("/etc/init.d/networking restart")
 		
 	def setDHCP(self, useDHCP):
 		if (useDHCP):
@@ -50,23 +87,26 @@ class Network:
 		pass
 		
 	def setIPAddress(self, ip):
-		os.system("echo ifconfig eth0 %d.%d.%d.%d" % tuple(ip))
-		self.writeNetworkConfig()
+		pass
+		#os.system("echo ifconfig eth0 %d.%d.%d.%d" % tuple(ip))
+		#self.writeNetworkConfig()
 
 	def setGateway(self, ip):
-		os.system("echo route add default gw %d.%d.%d.%d" % tuple(ip))
-		self.writeNetworkConfig()
+		pass
+		#os.system("echo route add default gw %d.%d.%d.%d" % tuple(ip))
+		#self.writeNetworkConfig()
 		
 	def setNetmask(self, ip):
-		os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))		
-		self.writeNetworkConfig()		
+		pass
+		#os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))		
+		#self.writeNetworkConfig()		
 
-def InitNetwork():
-	ipstr = gethostbyname(gethostname()).split('.')
-	ip = []
-	for i in ipstr:
-		ip.append(int(i))
 
+iNetwork = Network()
+
+def InitNetwork():
+	ip = map (int, gethostbyname(gethostname()).split('.'))
+		
 	config.network = ConfigSubsection()
 	config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, ("no", "yes"))
 	config.network.ip = configElement_nonSave("config.network.ip", configSequence, ip, (("."), (1,255)))
@@ -74,12 +114,13 @@ def InitNetwork():
 	config.network.gateway = configElement_nonSave("config.network.gateway", configSequence, [192,168,1,3], (("."), (1,255)))
 	config.network.dns = configElement_nonSave("config.network.dns", configSequence, [192,168,1,3], (("."), (1,255)))
 	config.network.mac = configElement_nonSave("config.network.mac", configSequence, [00,11,22,33,44,55], ((":"), (1,255)))
+
+	iNetwork.loadNetworkConfig()
 	
 	#FIXME using this till other concept for this is implemented
 	#config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes, sir", "you are my hero"))
 	#config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes", "you are my hero"))
 
-	iNetwork = Network()
 
 	def writeNetworkConfig(configElement):
 		iNetwork.writeNetworkConfig()
diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 0ffccb4e..d05a6365 100644
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -3,6 +3,7 @@ from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigList
 from Components.config import config
 from Components.config import getConfigListEntry
+from Components.Network import iNetwork
 
 class NetworkSetup(Screen):
     def __init__(self, session):
@@ -85,6 +86,9 @@ class NetworkSetup(Screen):
     def keySave(self):
         #for x in self["config"].list:
             #x[1].save()
+        
+        iNetwork.writeNetworkConfig()    
+        iNetwork.activateNetworkConfig()
         self.close()
 
     def keyCancel(self):