Merge pull request #338 from yast/bsc_976228_3

fix device name by-path handling (bsc#976228)
yast · May 20, 2016 · f90aef7 · f90aef7
2 parents 325ea99 + 8b5deb6
commit f90aef7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 20 16:14:34 CEST 2016 - snwint@suse.de
+
+- fix device name by-path handling (bsc#976228)
+- 3.1.94.10
+
 -------------------------------------------------------------------
 Fri Nov 20 07:19:26 UTC 2015 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.94.9
+Version:        3.1.94.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/BootStorage.rb b/src/modules/BootStorage.rb
@@ -146,10 +146,10 @@ def MapDevices
           Ops.set(@all_devices, dev_by_something, k)
         end
         # map disk by path
-        if Ops.get(v, "path") != "" && Ops.get(v, "path") != nil
+        if Ops.get(v, "udev_path") != "" && Ops.get(v, "udev_path") != nil
           dev_by_something = Ops.add(
             "/dev/disk/by-path/",
-            Ops.get_string(v, "path", "")
+            Ops.get_string(v, "udev_path", "")
           )
           Ops.set(@all_devices, dev_by_something, k)
         end
@@ -193,10 +193,10 @@ def MapDevices
             )
           end
           # map partition by path
-          if Ops.get(p, "path") != "" && Ops.get(p, "path") != nil
+          if Ops.get(p, "udev_path") != "" && Ops.get(p, "udev_path") != nil
             dev_by_something = Ops.add(
               "/dev/disk/by-path/",
-              Ops.get_string(p, "path", "")
+              Ops.get_string(p, "udev_path", "")
             )
             Ops.set(
               @all_devices,