diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-11-03 04:44:47 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-11-03 04:44:47 +0000 |
| commit | 6e1ce83a5819b78cc0e9cbc3d7d009ee15a66893 (patch) | |
| tree | 73b6a5e390fdfcc93f0aee5fe8d9380c99f025f0 | |
| parent | 9adb07a03e3ad8b71029d301956040db36baec34 (diff) | |
| download | anaconda-6e1ce83a5819b78cc0e9cbc3d7d009ee15a66893.tar.gz anaconda-6e1ce83a5819b78cc0e9cbc3d7d009ee15a66893.tar.xz anaconda-6e1ce83a5819b78cc0e9cbc3d7d009ee15a66893.zip | |
be less zealous about dns server stuff - backport from HEAD (#104055)
| -rw-r--r-- | network.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/network.py b/network.py index 5870bcf96..cdd8bdab8 100644 --- a/network.py +++ b/network.py @@ -273,13 +273,19 @@ class Network: return None if not self.primaryNS: return + myns = self.primaryNS if not self.isConfigured: for dev in self.netdevices.values(): - if dev.get('bootproto') == "dhcp": - self.primaryNS = isys.pumpNetDevice(dev.get('device')) + if (dev.get('bootproto') == "dhcp" and + dev.get('onboot') == "yes"): + ret = isys.pumpNetDevice(dev.get('device')) + if ret is None: + continue + myns = ret self.isConfigured = 1 break - elif dev.get('ipaddr') and dev.get('netmask') and self.gateway is not None: + elif (dev.get('ipaddr') and dev.get('netmask') and + self.gateway is not None and dev.get('onboot') == "yes"): try: isys.configNetDevice(dev.get('device'), dev.get('ipaddr'), @@ -296,7 +302,7 @@ class Network: return None f = open("/etc/resolv.conf", "w") - f.write("nameserver %s\n" % self.primaryNS) + f.write("nameserver %s\n" % myns) f.close() isys.resetResolv() isys.setResolvRetry(1) |