Since we're using the multipath tools, we don't need to group by serial.
Also don't use the name generator.
---
storage/devicetree.py | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/storage/devicetree.py b/storage/devicetree.py
index d3c4501..3c81b65 100644
--- a/storage/devicetree.py
+++ b/storage/devicetree.py
@@ -1596,13 +1596,11 @@ class DeviceTree(object):
def handleMultipathMemberFormat(self, info, device):
log_method_call(self, name=device.name, type=device.format.type)

- serial = udev_device_get_serial(info)
- found = False
- if self.__multipaths.has_key(serial):
- mp = self.__multipaths[serial]
+ name = udev_device_get_multipath_name(info)
+ if self.__multipaths.has_key(name):
+ mp = self.__multipaths[name]
mp.addParent(device)
else:
- name = generateMultipathDeviceName()
mp = MultipathDevice(name, info, parents=[device])
self.__multipaths[name] = mp

--
1.6.5.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

> diff --git a/storage/devicetree.py b/storage/devicetree.py
> index d3c4501..3c81b65 100644
> --- a/storage/devicetree.py
> +++ b/storage/devicetree.py
> @@ -1596,13 +1596,11 @@ class DeviceTree(object):
> def handleMultipathMemberFormat(self, info, device):
> log_method_call(self, name=device.name, type=device.format.type)
>
> - serial = udev_device_get_serial(info)
> - found = False
> - if self.__multipaths.has_key(serial):
> - mp = self.__multipaths[serial]
> + name = udev_device_get_multipath_name(info)
> + if self.__multipaths.has_key(name):
> + mp = self.__multipaths[name]
> mp.addParent(device)
> else:
> - name = generateMultipathDeviceName()
> mp = MultipathDevice(name, info, parents=[device])
> self.__multipaths[name] = mp

I was going to ask if this same thing needed to be done in
identifyMultipaths, but I see a later patch completely reworks that
method. So this looks fine.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list