git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missing newline at end of file
[enigma2.git]
/
lib
/
python
/
Components
/
Network.py
diff --git
a/lib/python/Components/Network.py
b/lib/python/Components/Network.py
index 484424be9abf842f88d3cc93ca72957896e81654..7d6c5e17e5104118f3e784b5a7898520939b4307 100644
(file)
--- a/
lib/python/Components/Network.py
+++ b/
lib/python/Components/Network.py
@@
-12,7
+12,7
@@
class Network:
# fixme using interfaces.tmp instead of interfaces for now
fp = file('/etc/network/interfaces', 'w')
fp.write("auto lo\n")
# fixme using interfaces.tmp instead of interfaces for now
fp = file('/etc/network/interfaces', 'w')
fp.write("auto lo\n")
- fp.write("iface lo inet loopback\n")
+ fp.write("iface lo inet loopback\n
\n
")
fp.write("auto eth0\n")
if (currentConfigSelectionElement(config.network.dhcp) == "yes"):
fp.write("iface eth0 inet dhcp\n")
fp.write("auto eth0\n")
if (currentConfigSelectionElement(config.network.dhcp) == "yes"):
fp.write("iface eth0 inet dhcp\n")
@@
-21,14
+21,11
@@
class Network:
fp.write(" address %d.%d.%d.%d\n" % tuple(config.network.ip.value))
fp.write(" netmask %d.%d.%d.%d\n" % tuple(config.network.netmask.value))
fp.write(" gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
fp.write(" address %d.%d.%d.%d\n" % tuple(config.network.ip.value))
fp.write(" netmask %d.%d.%d.%d\n" % tuple(config.network.netmask.value))
fp.write(" gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
+ fp2 = file('/etc/resolv.conf', 'w')
+ fp2.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
+ fp2.close()
fp.close()
fp.close()
- if (currentConfigSelectionElement(config.network.dhcp) == "yes"):
- fp = file('/etc/resolv.conf', 'w')
- fp.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
- fp.close()
-
-
def loadNetworkConfig(self):
try:
# parse the interfaces-file
def loadNetworkConfig(self):
try:
# parse the interfaces-file