X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/29d62cc699d7043a749e6f184925b7fd14b5daab..256eda99abcf5486ed8433180a75da1e6afb86ac:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index c0b799ba..f65d6090 100755
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -27,6 +27,16 @@ class Network:
 		self.config_ready = None
 		self.getInterfaces()
 
+	def onRemoteRootFS(self):
+		fp = file('/proc/mounts', 'r')
+		mounts = fp.readlines()
+		fp.close()
+		for line in mounts:
+			parts = line.strip().split(' ')
+			if parts[1] == '/' and (parts[2] == 'nfs' or parts[2] == 'smbfs'):
+				return True
+		return False
+
 	def getInterfaces(self, callback = None):
 		devicesPattern = re_compile('[a-z]+[0-9]+')
 		self.configuredInterfaces = []
@@ -36,7 +46,7 @@ class Network:
 		for line in result:
 			try:
 				device = devicesPattern.search(line).group()
-				if device == 'wifi0':
+				if device in ('wifi0', 'wmaster0'):
 					continue
 				self.getDataForInterface(device, callback)
 			except AttributeError:
@@ -206,7 +216,7 @@ class Network:
 					ifaces[currif]["gateway"] = map(int, split[1].split('.'))
 					if self.ifaces[currif].has_key("gateway"):
 						if self.ifaces[currif]["gateway"] != ifaces[currif]["gateway"] and ifaces[currif]["dhcp"] == False:
-							self.ifaces[currif]["gateway"] = map(int, split[1].split('.'))					
+							self.ifaces[currif]["gateway"] = map(int, split[1].split('.'))
 				if (split[0] == "pre-up"):
 					if self.ifaces[currif].has_key("preup"):
 						self.ifaces[currif]["preup"] = i
@@ -253,6 +263,10 @@ class Network:
 		print "nameservers:", self.nameservers
 
 	def deactivateNetworkConfig(self, callback = None):
+		if self.onRemoteRootFS():
+			if callback is not None:
+				callback(True)
+			return
 		self.deactivateConsole = Console()
 		self.commands = []
 		self.commands.append("/etc/init.d/avahi-daemon stop")
@@ -271,6 +285,10 @@ class Network:
 				callback(True)
 
 	def activateNetworkConfig(self, callback = None):
+		if self.onRemoteRootFS():
+			if callback is not None:
+				callback(True)
+			return
 		self.activateConsole = Console()
 		self.commands = []
 		self.commands.append("/etc/init.d/networking start")
@@ -344,6 +362,10 @@ class Network:
 					self.nameservers[i] = newnameserver
 
 	def resetNetworkConfig(self, mode='lan', callback = None):
+		if self.onRemoteRootFS():
+			if callback is not None:
+				callback(True)
+			return
 		self.resetNetworkConsole = Console()
 		self.commands = []
 		self.commands.append("/etc/init.d/avahi-daemon stop")
@@ -422,6 +444,10 @@ class Network:
 					statecallback(self.NetworkState)
 		
 	def restartNetwork(self,callback = None):
+		if self.onRemoteRootFS():
+			if callback is not None:
+				callback(True)
+			return
 		self.restartConsole = Console()
 		self.config_ready = False
 		self.msgPlugins()
@@ -515,6 +541,10 @@ class Network:
 					statecallback(self.DnsState)
 
 	def deactivateInterface(self,iface,callback = None):
+		if self.onRemoteRootFS():
+			if callback is not None:
+				callback(True)
+			return
 		self.deactivateInterfaceConsole = Console()
 		self.commands = []
 		cmd1 = "ip addr flush " + iface