From 7957c749d80d45b1e3375ffe1b4e172d37241a10 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Aug 04 2009 14:41:16 +0000
Subject: The names of a couple basic udev methods has changed.


---

diff --git a/anaconda b/anaconda
index e7c4b7a..705edca 100755
--- a/anaconda
+++ b/anaconda
@@ -562,7 +562,7 @@ if __name__ == "__main__":
     # automatically, I don't know.  but we need to trigger so that we
     # have all the information about netdevs that we care about for 
     # NetworkManager in the udev database
-    from storage.udev import udev_trigger, udev_settle
+    from baseudev import udev_trigger, udev_settle
     udev_trigger("net")
     udev_settle()
     # and for added fun, once doesn't seem to be enough?  so we 
diff --git a/isys/isys.py b/isys/isys.py
index f1003b5..13ba807 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -581,7 +581,7 @@ def getMacAddress(dev):
 
 # Get a description string for a network device (e.g., eth0)
 def getNetDevDesc(dev):
-    from storage.udev import udev_get_block_device
+    from baseudev import udev_get_device
     desc = "Network Interface"
 
     if dev == '' or dev is None:
@@ -599,7 +599,7 @@ def getNetDevDesc(dev):
         if dev == device_props['Interface']:
             # This is the sysfs path (for now).
             udev_path = device_props['Udi']
-            dev = udev_get_block_device(udev_path, requireName=False)
+            dev = udev_get_device(udev_path)
 
             if dev is None:
                 log.debug("weird, we have a None dev with path %s" % path)