summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-08-03 13:59:48 -0400
committerChris Lumens <clumens@redhat.com>2009-08-04 10:41:16 -0400
commit7957c749d80d45b1e3375ffe1b4e172d37241a10 (patch)
tree79d7198fce70f26230fa02c0ddf63b58dfb41d50
parent4b954d1232992b33b7491a89689737842fe926c2 (diff)
downloadanaconda-7957c749d80d45b1e3375ffe1b4e172d37241a10.tar.gz
anaconda-7957c749d80d45b1e3375ffe1b4e172d37241a10.tar.xz
anaconda-7957c749d80d45b1e3375ffe1b4e172d37241a10.zip
The names of a couple basic udev methods has changed.
-rwxr-xr-xanaconda2
-rwxr-xr-xisys/isys.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/anaconda b/anaconda
index e7c4b7a8e..705edca24 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 f1003b59b..13ba807d8 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)