X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d58ca4cf34b7621aea4e2c1ff07bed6b2cd6b763..6be112ae10b8eb851ddac2f49412af766d611b25:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 64b3aa6c..31a90282 100755
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -3,6 +3,8 @@ from re import compile as re_compile, search as re_search
 from socket import *
 from enigma import eConsoleAppContainer
 from Components.Console import Console
+from Components.PluginComponent import plugins
+from Plugins.Plugin import PluginDescriptor
 
 class Network:
 	def __init__(self):
@@ -22,8 +24,19 @@ class Network:
 		self.activateConsole = Console()
 		self.resetNetworkConsole = Console()
 		self.DnsConsole = Console()
+		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 = []
@@ -222,6 +235,8 @@ class Network:
 				self.loadNameserverConfig()
 				print "read configured interfac:", ifaces
 				print "self.ifaces after loading:", self.ifaces
+				self.config_ready = True
+				self.msgPlugins()
 				if callback is not None:
 					callback(True)
 
@@ -248,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")
@@ -266,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")
@@ -339,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")
@@ -417,7 +444,13 @@ 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()
 		self.commands = []
 		self.commands.append("/etc/init.d/avahi-daemon stop")
 		for iface in self.ifaces.keys():
@@ -448,24 +481,34 @@ class Network:
 			
 	def stopLinkStateConsole(self):
 		if self.LinkConsole is not None:
-			self.LinkConsole = None
-
+			if len(self.LinkConsole.appContainers):
+				for name in self.LinkConsole.appContainers.keys():
+					self.LinkConsole.kill(name)
+					
 	def stopDNSConsole(self):
 		if self.DnsConsole is not None:
-			self.DnsConsole = None
-
+			if len(self.DnsConsole.appContainers):
+				for name in self.DnsConsole.appContainers.keys():
+					self.DnsConsole.kill(name)
+					
 	def stopRestartConsole(self):
 		if self.restartConsole is not None:
-			self.restartConsole = None
-			
+			if len(self.restartConsole.appContainers):
+				for name in self.restartConsole.appContainers.keys():
+					self.restartConsole.kill(name)
+					
 	def stopGetInterfacesConsole(self):
 		if self.Console is not None:
-			self.Console = None
-
+			if len(self.Console.appContainers):
+				for name in self.Console.appContainers.keys():
+					self.Console.kill(name)
+					
 	def stopDeactivateInterfaceConsole(self):
-		if self.deactivateInterfaceConsole:
-			self.deactivateInterfaceConsole = None
-			
+		if self.deactivateInterfaceConsole is not None:
+			if len(self.deactivateInterfaceConsole.appContainers):
+				for name in self.deactivateInterfaceConsole.appContainers.keys():
+					self.deactivateInterfaceConsole.kill(name)
+					
 	def checkforInterface(self,iface):
 		if self.getAdapterAttribute(iface, 'up') is True:
 			return True
@@ -498,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
@@ -547,6 +594,11 @@ class Network:
 			netmask = str(inet_ntoa(pack('>L', nm)))
 			return netmask
 	
+	def msgPlugins(self):
+		if self.config_ready is not None:
+			for p in plugins.getPlugins(PluginDescriptor.WHERE_NETWORKCONFIG_READ):
+				p(reason=self.config_ready)
+	
 iNetwork = Network()
 
 def InitNetwork():