Call network.bringDeviceUp() instead of old isys functions.

Both isys.dhcpNetDevice() and isys.configNetDevice() have been
replaced with network.bringDeviceUp().

3 files changed, 16 insertions, 67 deletions

diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py
index 954b299cf..8e32076d0 100644
--- a/iw/netconfig_dialog.py
+++ b/iw/netconfig_dialog.py
@@ -85,32 +85,32 @@ class NetworkConfigurator:
         if cb.get_active():
             self.xml.get_widget("ipv4Box").set_sensitive(True)
         else:
-            self.xml.get_widget("ipv4Box").set_sensitive(False)            
+            self.xml.get_widget("ipv4Box").set_sensitive(False)
 
     def _ipv6Toggled(self, cb):
         if self.xml.get_widget("dhcpCheckbutton").get_active():
             return
         if cb.get_active():
-            self.xml.get_widget("ipv6Box").set_sensitive(True)            
+            self.xml.get_widget("ipv6Box").set_sensitive(True)
         else:
             self.xml.get_widget("ipv6Box").set_sensitive(False)
-            
+
     def _dhcpToggled(self, cb):
         boxes = ("ipv4Box", "ipv6Box", "nameserverBox", "gatewayBox")
         if not cb.get_active():
             map(lambda x: self.xml.get_widget(x).set_sensitive(True), boxes)
             self.xml.get_widget("ipv4Box").set_sensitive(self.xml.get_widget("ipv4Checkbutton").get_active())
-            self.xml.get_widget("ipv6Box").set_sensitive(self.xml.get_widget("ipv6Checkbutton").get_active())            
+            self.xml.get_widget("ipv6Box").set_sensitive(self.xml.get_widget("ipv6Checkbutton").get_active())
         else:
             map(lambda x: self.xml.get_widget(x).set_sensitive(False), boxes)
-            
+
     def _populateNetdevs(self):
         combo = self.xml.get_widget("interfaceCombo")
 
         cell = gtk.CellRendererText()
         combo.pack_start(cell, True)
         combo.set_attributes(cell, text = 0)
-        cell.set_property("wrap-width", 525)        
+        cell.set_property("wrap-width", 525)
         combo.set_size_request(480, -1)
 
         store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
@@ -181,24 +181,16 @@ class NetworkConfigurator:
         val = combo.get_model().get_value(active, 1)
         netdev = self.network.available()[val]
 
-        netdev.set(('useipv4', True))
-
         # FIXME: need to do input validation
         if self.xml.get_widget("dhcpCheckbutton").get_active():
-            netdev.set(('bootproto', 'dhcp'))
+            netdev.set(('BOOTPROTO', 'dhcp'))
             self.window.hide()
             w = gui.WaitWindow(_("Dynamic IP"),
                                _("Sending request for IP information "
                                  "for %s...") %(netdev.get("device")))
-            ns = isys.dhcpNetDevice(netdev)
+            netdev.bringDeviceUp()
             w.pop()
-            if ns is not None:
-                self.rc = gtk.RESPONSE_OK
-            if ns:
-                f = open("/etc/resolv.conf", "w")
-                f.write("nameserver %s\n" % ns)
-                f.close()
-                isys.resetResolv()
+            self.rc = gtk.RESPONSE_OK
         else:
             ipv4addr = self.xml.get_widget("ipv4Address").get_text()
             ipv4nm = self.xml.get_widget("ipv4Netmask").get_text()
@@ -259,7 +251,7 @@ class NetworkConfigurator:
 
 
             try:
-                isys.configNetDevice(netdev, gateway)
+                netdev.bringDeviceUp()
             except Exception, e:
                 import logging
                 log = logging.getLogger("anaconda")
@@ -272,8 +264,6 @@ class NetworkConfigurator:
                 f = open("/etc/resolv.conf", "w")
                 f.write("nameserver %s\n" %(ns,))
                 f.close()
-                isys.resetResolv()
-                isys.setResolvRetry(1)
 
         if self.rc != gtk.RESPONSE_OK:
             gui.MessageWindow(_("Error"),
@@ -281,7 +271,7 @@ class NetworkConfigurator:
                               type = "ok", custom_icon="error")
             return False
         return True
-        
+
 
 
 def main():
diff --git a/rescue.py b/rescue.py
index 04119e0f2..4376bddab 100644
--- a/rescue.py
+++ b/rescue.py
@@ -143,47 +143,16 @@ def startNetworking(network, intf):
         log.error("Error trying to start lo in rescue.py::startNetworking()")
 
     # start up dhcp interfaces first
-    dhcpGotNS = 0
     devs = network.netdevices.keys()
     devs.sort()
     for devname in devs:
         dev = network.netdevices[devname]
         waitwin = intf.waitWindow(_("Starting Interface"),
                                   _("Attempting to start %s") % (dev.get('device'),))
-        log.info("Attempting to start %s", dev.get('device'))
-        if dev.get('bootproto').lower() == "dhcp":
-            try:
-                ns = isys.dhcpNetDevice(dev)
-                if ns:
-                    if not dhcpGotNS:
-                        dhcpGotNS = 1
-
-                        f = open("/etc/resolv.conf", "w")
-                        f.write("nameserver %s\n" % ns)
-                        f.close()
-            except:
-                log.error("Error trying to start %s in rescue.py::startNetworking()", dev.get('device'))
-        else:
-            try:
-                isys.configNetDevice(dev, network.gateway)
-            except:
-                log.error("Error trying to start %s in rescue.py::startNetworking()", dev.get('device'))
-
+        log.info("Attempting to start %s", dev.get('DEVICE'))
+        dev.bringDeviceUp()
         waitwin.pop()
 
-    # write out resolv.conf if dhcp didn't get us one
-    if not dhcpGotNS:
-        f = open("/etc/resolv.conf", "w")
-
-        if network.domains != ['localdomain'] and network.domains:
-            f.write("search %s\n" % (string.joinfields(network.domains, ' '),))
-
-        for ns in network.nameservers():
-            if ns:
-                f.write("nameserver %s\n" % (ns,))
-
-        f.close()
-
 def runShell(screen = None, msg=""):
     if screen:
         screen.suspend()
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