[blivet][rhel7-branch] fix detection of existing md

[David Lehman]

Pass the correct UUIDs to the mdmember format constructor.

David Lehman (1):
  Fix handling of UUIDs for existing MD devices.

blivet/devicetree.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

[PATCH] Fix handling of UUIDs for existing MD devices.

[David Lehman]

Resolves: rhbz#1234333
---
 blivet/devicetree.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 6c6d756..73facfe 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1892,15 +1892,10 @@ class DeviceTree(object):
             kwargs["name"] = "luks-%s" % uuid
         elif format_type in formats.mdraid.MDRaidMember._udevTypes:
             # mdraid
-            try:
-                kwargs["mdUuid"] = udev.device_get_md_uuid(info)
-            except KeyError:
-                log.warning("mdraid member %s has no md uuid", name)
-
             # reset the uuid to the member-specific value
             # this will be None for members of v0 metadata arrays
-            kwargs["uuid"] = udev.device_get_md_device_uuid(info)
-
+            kwargs["uuid"] = info.get("ID_FS_UUID_SUB")
+            kwargs["mdUuid"] = uuid
             kwargs["biosraid"] = udev.device_is_biosraid_member(info)
         elif format_type == "LVM2_member":
             # lvm

[PATCH] Fix handling of UUIDs for existing MD devices.

[Vratislav Podzimek]

On Tue, 2015-06-30 at 14:03 -0500, David Lehman wrote:
> Resolves: rhbz#1234333
>
> blivet/devicetree.py | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/blivet/devicetree.py b/blivet/devicetree.py
> index 6c6d756..73facfe 100644
> --- a/blivet/devicetree.py
> +++ b/blivet/devicetree.py
> @@ -1892,15 +1892,10 @@ class DeviceTree(object):
>              kwargs["name"] = "luks-%s" % uuid
>          elif format_type in formats.mdraid.MDRaidMember._udevTypes:
>              # mdraid
>        try:
>            kwargs["mdUuid"] = udev.device_get_md_uuid(info)
>        except KeyError:
>            log.warning("mdraid member %s has no md uuid", name)
>        # reset the uuid to the member-specific value
>        # this will be None for members of v0 metadata arrays
>        kwargs["uuid"] = udev.device_get_md_device_uuid(info)
>        kwargs["uuid"] = info.get("ID_FS_UUID_SUB")
>        kwargs["mdUuid"] = uuid
>        kwargs["biosraid"] = udev.device_is_biosraid_member(info)
>    elif format_type == "LVM2_member":
>        # lvm

ACK.