Merge pull request #164 from yast/clone_s390_fix

Clone s390 fix
yast · Sep 23, 2014 · b1eb7d7 · b1eb7d7
2 parents 1b30549 + 04cb5df
commit b1eb7d7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 23 12:15:25 UTC 2014 - jreidinger@suse.com
+
+- Avoid crash in clone_system on s390 (bnc#897399)
+- 3.1.94.4
+
 -------------------------------------------------------------------
 Thu Sep 18 15:24:43 UTC 2014 - jreidinger@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.3
+Version:        3.1.94.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/BootStorage.rb b/src/modules/BootStorage.rb
@@ -943,18 +943,18 @@ def ProposeDeviceMap
       @device_mapping = {}
       @multipath_mapping = {}
 
+      if Mode.config
+        Builtins.y2milestone("Skipping device map proposing in Config mode")
+        return
+      end
+
       if Arch.s390
         return propose_s390_device_map
       end
 
       usb_disks = [] # contains usb removable disks as it can affect BIOS order of disks
 
-      targetMap = {}
-      if Mode.config
-        Builtins.y2milestone("Skipping device map proposing in Config mode")
-      else
-        targetMap = Storage.GetTargetMap
-      end
+      targetMap = Storage.GetTargetMap
 
       # filter out non-disk devices
       targetMap = Builtins.filter(targetMap) do |k, v|