diff options
| author | David Lehman <dlehman@redhat.com> | 2011-02-19 10:57:31 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2011-02-21 10:30:49 -0600 |
| commit | be92c7739b835b9e0cec90fad75a943e7a51603e (patch) | |
| tree | 11f3454e6db25a5c0ba43428ae9cfa61d1ec9f8d | |
| parent | ce69582065955c380db29cb735eaac9f429f08b5 (diff) | |
| download | anaconda-be92c7739b835b9e0cec90fad75a943e7a51603e.tar.gz anaconda-be92c7739b835b9e0cec90fad75a943e7a51603e.tar.xz anaconda-be92c7739b835b9e0cec90fad75a943e7a51603e.zip | |
Do all dm handling inside addUdevDMDevice. (#672030)
The by-uuid lookup was returning a loop device since it has
the same contents as the dm device, which led to us not ever
adding live-osimg-min to the device tree for live installs.
Since UUIDs are not necessarily device-specific (as evidenced
by the case of fs UUID on loop device and same fs UUID on dm
device representing the contents of said loop device) we
can't rely on them for dm device lookups unless we
differentiate between device UUIDs and formatting UUIDs.
| -rw-r--r-- | pyanaconda/storage/devicetree.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py index 6fac6f58e..bf4b7ac20 100644 --- a/pyanaconda/storage/devicetree.py +++ b/pyanaconda/storage/devicetree.py @@ -954,13 +954,7 @@ class DeviceTree(object): device = self.addUdevLVDevice(info) elif udev_device_is_dm(info): log.debug("%s is a device-mapper device" % name) - # try to look up the device - if uuid: - # try to find the device by uuid - device = self.getDeviceByUuid(uuid) - - if device is None: - device = self.addUdevDMDevice(info) + device = self.addUdevDMDevice(info) elif udev_device_is_md(info): log.debug("%s is an md device" % name) if uuid: |