Merge pull request #403 from yast/SLE-12-SP1_bnc_1018180

Edit AY settings
yast · Jan 10, 2017 · 8664d87 · 8664d87
2 parents b7b52e7 + 9442a9f
commit 8664d87
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 10 10:57:15 CET 2017 - schubi@suse.de
+
+- AutoYaST: Do not crash while editing settings in AutoYaST
+  configuration module (with device_maps) (bnc#1018180)
+- 3.1.163
+
 -------------------------------------------------------------------
 Tue Nov 29 09:17:26 UTC 2016 - 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.162
+Version:        3.1.163
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/bootloader/routines/misc.rb b/src/include/bootloader/routines/misc.rb
@@ -102,7 +102,10 @@ def getAnyTypeAttrib(attrib, defaultv)
     # @return [Hash{String => String}] globals
 
     def remapGlobals(globals_set)
-      return globals_set if !Arch.ppc && Storage.GetDefaultMountBy == :label
+      if Mode.config || # AutoYaST configuration mode --> no Storage available
+          !Arch.ppc && Storage.GetDefaultMountBy == :label
+        return globals_set
+      end
 
       globals_set["boot_custom"] &&=
         ::Bootloader::UdevMapping.to_kernel_device(globals_set["boot_custom"])

diff --git a/src/lib/bootloader/device_map.rb b/src/lib/bootloader/device_map.rb
@@ -43,8 +43,9 @@ def disks_order
     # or to label (ufo_disk)
     # @return [Hash{String => String}] new device map
     def remapped_hash
-      if !Yast::Arch.ppc
-        return to_hash if Yast::Storage.GetDefaultMountBy == :label
+      if Yast::Mode.config || # AutoYaST configuration mode --> no Storage available
+          !Yast::Arch.ppc && Yast::Storage.GetDefaultMountBy == :label
+        return to_hash
       end
 
       # convert device names in device map to the device names by device or label