summaryrefslogtreecommitdiffstats
path: root/network.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-10-09 21:24:53 +0000
committerJeremy Katz <katzj@redhat.com>2006-10-09 21:24:53 +0000
commitf3d947c3581d98ee1a66a6c1fc34c72c7187c4c2 (patch)
tree7fdac3719825a9e5cea0edbe17c5c7777ca6e263 /network.py
parent7bddcbe9b2675ad172e2485d5f07fec95eb9f05b (diff)
downloadanaconda-f3d947c3581d98ee1a66a6c1fc34c72c7187c4c2.tar.gz
anaconda-f3d947c3581d98ee1a66a6c1fc34c72c7187c4c2.tar.xz
anaconda-f3d947c3581d98ee1a66a6c1fc34c72c7187c4c2.zip
2006-10-09 Jeremy Katz <katzj@redhat.com>
* network.py (Network.__init__): Default ipv4 and ipv6 to being enabled so that we get network devices enabled postinstall on CD installs
Diffstat (limited to 'network.py')
-rw-r--r--network.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/network.py b/network.py
index 85e6820f7..1e5744ccb 100644
--- a/network.py
+++ b/network.py
@@ -172,8 +172,8 @@ class Network:
self.domains = []
self.isConfigured = 0
self.hostname = "localhost.localdomain"
- self.useIPv4 = False
- self.useIPv6 = False
+ self.useIPv4 = True
+ self.useIPv6 = True
# if we specify a hostname and are using dhcp, do an override
# originally used by the gui but overloaded now
@@ -211,14 +211,10 @@ class Network:
if info.has_key("HOSTNAME"):
self.hostname = info["HOSTNAME"]
if info.has_key("BOOTPROTO"):
- if info["BOOTPROTO"].lower() == "dhcp":
- self.useIPv4 = True
- self.useIPv6 = True
- else:
- if info.has_key("IPADDR"):
- self.useIPv4 = True
- if info.has_key("IPV6ADDR"):
- self.useIPv6 = True
+ if not info.has_key("IPADDR"):
+ self.useIPv4 = False
+ if not info.has_key("IPV6ADDR"):
+ self.useIPv6 = False
try:
f = open("/etc/resolv.conf", "r")