X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/936a62a34cdd093d417e1b398e277166cd176db1..369453136be3251354bf77bfa79c8c2e445e2cd2:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 884f97cd..d10163fb 100644
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -1,5 +1,3 @@
-from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigMAC
-
 import os
 import re
 from socket import *
@@ -95,7 +93,7 @@ class Network:
 		return data
 
 	def writeNetworkConfig(self):
-		fp = file('/etc/network/interfaces.tmp', 'w')
+		fp = file('/etc/network/interfaces', 'w')
 		fp.write("# automatically generated by enigma 2\n# do NOT change manually!\n\n")
 		fp.write("auto lo\n")
 		fp.write("iface lo inet loopback\n\n")
@@ -113,6 +111,9 @@ class Network:
 					fp.write("	netmask %d.%d.%d.%d\n" % tuple(iface['netmask']))
 					if iface.has_key('gateway'):
 						fp.write("	gateway %d.%d.%d.%d\n" % tuple(iface['gateway']))
+						
+			if iface.has_key("configStrings"):
+				fp.write("\n" + iface["configStrings"] + "\n")
 			fp.write("\n")
 		fp.close()
 		self.writeNameserverConfig()
@@ -131,7 +132,7 @@ class Network:
 		interfaces = []
 		# parse the interfaces-file
 		try:
-			fp = file('/etc/network/interfaces.tmp', 'r')
+			fp = file('/etc/network/interfaces', 'r')
 			interfaces = fp.readlines()
 			fp.close()
 		except:
@@ -187,7 +188,7 @@ class Network:
 
 	def deactivateNetworkConfig(self):
 		for iface in self.ifaces.keys():
-			os.system("ip addr flush" + iface)
+			os.system("ip addr flush " + iface)
 		os.system("/etc/init.d/networking stop")
 		os.system("killall -9 udhcpc")
 		os.system("rm /var/run/udhcpc*")
@@ -197,7 +198,15 @@ class Network:
 		
 	def getNumberOfAdapters(self):
 		return len(self.ifaces)
-	
+
+	def getFriendlyAdapterName(self, x):
+		# maybe this needs to be replaced by an external list.
+		friendlyNames = {
+			"eth0": _("Integrated Ethernet"),
+			"wlan0": _("Wireless")
+		}
+		return friendlyNames.get(x, x) # when we have no friendly name, use adapter name
+
 	def getAdapterName(self, iface):
 		return iface
 	
@@ -211,6 +220,7 @@ class Network:
 		return None
 	
 	def setAdapterAttribute(self, iface, attribute, value):
+		print "setting for adapter", iface, "attribute", attribute, " to value", value
 		if self.ifaces.has_key(iface):
 			self.ifaces[iface][attribute] = value