Merge pull request #113 from yast/ay_fix

properly install packages if autoyast profile do not specify bootloader
yast · Jun 27, 2014 · 0d8e416 · 0d8e416
2 parents 128addb + 7495a50
commit 0d8e416
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 27 12:27:05 UTC 2014 - jreidinger@suse.com
+
+- properly install needed packages in autoinstallation
+- 3.1.59
+
 -------------------------------------------------------------------
 Thu Jun 26 10:50:28 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.58
+Version:        3.1.59
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/Bootloader.rb b/src/modules/Bootloader.rb
@@ -128,12 +128,13 @@ def Import(settings)
       BootCommon.changed = true
       BootCommon.location_changed = true
 
-      if Ops.get(settings, "loader_type") == ""
-        Ops.set(settings, "loader_type", nil)
+      if settings["loader_type"] == ""
+        settings["loader_type"] = nil
       end
-      loader_type = Ops.get_string(settings, "loader_type")
+      # if bootloader is not set, then propose it
+      loader_type = settings["loader_type"] || BootCommon.getLoaderType(true)
+      # Explitelly set it to ensure it is installed
       BootCommon.setLoaderType(loader_type)
-      BootCommon.getLoaderType(false)
 
       if !(loader_type == "grub")
         # import loader_device and selected_location only for bootloaders