summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--network.py7
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f01491dfd..176ffa546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-26 David Cantrell <dcantrell@redhat.com>
+
+ * network.py (Network): UI isn't using it, so removed references to
+ a third nameserver setting (which should be called tertiary NS, not
+ ternary NS).
+
2006-09-26 Jeremy Katz <katzj@redhat.com>
* textw/partition_text.py (PartitionTypeWindow.__call__): Fix the
diff --git a/network.py b/network.py
index 5c2d17b7e..cadc0f389 100644
--- a/network.py
+++ b/network.py
@@ -167,7 +167,6 @@ class Network:
self.gateway = ""
self.primaryNS = ""
self.secondaryNS = ""
- self.ternaryNS = ""
self.domains = []
self.isConfigured = 0
self.hostname = "localhost.localdomain"
@@ -233,8 +232,6 @@ class Network:
self.primaryNS = resolv[1]
elif self.secondaryNS == "":
self.secondaryNS = resolv[1]
- elif self.ternaryNS == "":
- self.ternaryNS = resolv[1]
# now initialize remaining devices
# XXX we just throw return away, the method initialize a
@@ -317,8 +314,6 @@ class Network:
self.primaryNS = dns[0]
if len(dns) >= 2:
self.secondaryNS = dns[1]
- if len(dns) >= 3:
- self.ternaryNS = dns[2]
def setGateway(self, gw):
self.gateway = gw
@@ -379,7 +374,7 @@ class Network:
return ip
def nameservers(self):
- return (self.primaryNS, self.secondaryNS, self.ternaryNS)
+ return (self.primaryNS, self.secondaryNS)
def dnsString(self):
str = ""