diff options
| author | David Cantrell <dcantrell@redhat.com> | 2008-09-15 17:07:57 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2008-09-15 17:07:57 -1000 |
| commit | 64b1d0d2725dbcda884fbde812aac3c5b7ac768f (patch) | |
| tree | b93a07b65cb12edc0d6c18212b35290b06306ef3 /textw | |
| parent | 91dd237d0fa59a23513a37c733d82bb7f96d8587 (diff) | |
| download | anaconda-64b1d0d2725dbcda884fbde812aac3c5b7ac768f.tar.gz anaconda-64b1d0d2725dbcda884fbde812aac3c5b7ac768f.tar.xz anaconda-64b1d0d2725dbcda884fbde812aac3c5b7ac768f.zip | |
Call network.bringDeviceUp() instead of old isys functions.
Both isys.dhcpNetDevice() and isys.configNetDevice() have been
replaced with network.bringDeviceUp().
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/netconfig_text.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/textw/netconfig_text.py b/textw/netconfig_text.py index f78c56dac..71b06c93e 100644 --- a/textw/netconfig_text.py +++ b/textw/netconfig_text.py @@ -173,23 +173,15 @@ class NetworkConfiguratorText: continue netdev = self.anaconda.id.network.available()[cur] - netdev.set(("useipv4", True)) if self.dhcpCheckbox.selected(): netdev.set(("bootproto", "dhcp")) w = self.anaconda.intf.waitWindow(_("Dynamic IP"), _("Sending request for IP information " "for %s...") % netdev.get("device")) - ns = isys.dhcpNetDevice(netdev) + netdev.bringDeviceUp() w.pop() - - if ns is None: - break - else: - f = open("/etc/resolv.conf", "w") - f.write("nameserver %s\n" % ns) - f.close() - isys.resetResolv() + break else: ipv4addr = self.ipv4Address.value() ipv4nm = self.ipv4Netmask.value() @@ -249,7 +241,7 @@ class NetworkConfiguratorText: continue try: - isys.configNetDevice(netdev, gateway) + netdev.bringDeviceUp() except Exception, e: import logging log = logging.getLogger("anaconda") @@ -262,8 +254,6 @@ class NetworkConfiguratorText: f = open("/etc/resolv.conf", "w") f.write("nameserver %s\n" % ns) f.close() - isys.resetResolv() - isys.setResolvRetry(1) break break |