[rhel6-branch] use udev_resolve_devspec to resolve raid onpart members (#809641)

[Brian C. Lane]

From: "Brian C. Lane"

--onpart may be used with /dev/disk/by-* so first try to resolve it with udev

Resolves: rhbz#809641
---
 kickstart.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kickstart.py b/kickstart.py
index 05803ab..bac6ab0 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -975,7 +975,8 @@ class RaidData(commands.raid.F12_RaidData):
         for member in self.members:
             # if member is using --onpart, use original device
             member = anaconda.id.ksdata.onPart.get(member, member)
-            dev = devicetree.getDeviceByName(member)
+            dev_name = udev_resolve_devspec(member) or member
+            dev = devicetree.getDeviceByName(dev_name)
             if dev and dev.format.type == "luks":
                 try:
                     dev = devicetree.getChildren(dev)[0]

[Vratislav Podzimek]

ACK.

On Fri, 2012-09-28 at 15:20 -0700, Brian C. Lane wrote:
> From: "Brian C. Lane"
>
> --onpart may be used with /dev/disk/by-* so first try to resolve it with udev
> Resolves: rhbz#809641
>
> kickstart.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/kickstart.py b/kickstart.py
> index 05803ab..bac6ab0 100644
> --- a/kickstart.py
> +++ b/kickstart.py
> @@ -975,7 +975,8 @@ class RaidData(commands.raid.F12_RaidData):
>          for member in self.members:
>              # if member is using --onpart, use original device
>              member = anaconda.id.ksdata.onPart.get(member, member)
>        dev = devicetree.getDeviceByName(member)
>        dev_name = udev_resolve_devspec(member) or member
>        dev = devicetree.getDeviceByName(dev_name)
>        if dev and dev.format.type == "luks":
>            try:
>                dev = devicetree.getChildren(dev)[0]