git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ba7efe
)
don't touch network configuration on remote rootfs
author
Andreas Oberritter
<obi@saftware.de>
Tue, 7 Jul 2009 21:37:57 +0000
(23:37 +0200)
committer
Andreas Oberritter
<obi@saftware.de>
Tue, 7 Jul 2009 21:37:57 +0000
(23:37 +0200)
lib/python/Components/Network.py
patch
|
blob
|
history
diff --git
a/lib/python/Components/Network.py
b/lib/python/Components/Network.py
index 5f7095c4078eeaec9541ff13c47d4c143ccdfb00..31a90282c3d1e35279850ced51625eeae7c717a8 100755
(executable)
--- a/
lib/python/Components/Network.py
+++ b/
lib/python/Components/Network.py
@@
-27,6
+27,16
@@
class Network:
self.config_ready = None
self.getInterfaces()
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 = []
def getInterfaces(self, callback = None):
devicesPattern = re_compile('[a-z]+[0-9]+')
self.configuredInterfaces = []
@@
-253,6
+263,10
@@
class Network:
print "nameservers:", self.nameservers
def deactivateNetworkConfig(self, callback = None):
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")
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):
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")
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):
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")
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):
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.restartConsole = Console()
self.config_ready = False
self.msgPlugins()
@@
-515,6
+541,10
@@
class Network:
statecallback(self.DnsState)
def deactivateInterface(self,iface,callback = None):
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
self.deactivateInterfaceConsole = Console()
self.commands = []
cmd1 = "ip addr flush " + iface