warn when autoyast have wrong loader type

yast · May 3, 2018 · c87e314 · c87e314
1 parent aaac72e
commit c87e314
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/lib/bootloader/auto_client.rb b/src/lib/bootloader/auto_client.rb
@@ -3,8 +3,10 @@
 require "installation/auto_client"
 require "bootloader/bootloader_factory"
 require "bootloader/autoyast_converter"
+require "bootloader/exceptions"
 require "bootloader/main_dialog"
 
+Yast.import "AutoInstall"
 Yast.import "Bootloader"
 Yast.import "BootStorage"
 Yast.import "Initrd"
@@ -27,7 +29,18 @@ def run
     end
 
     def import(data)
-      Yast::Bootloader.Import(data)
+      begin
+        Yast::Bootloader.Import(data)
+      rescue Bootloader::UnsupportedBootloader => e
+        possible_values = BootloaderFactory.supported_names + ["default"]
+        AutoInstall.issues_list.add(:invalid_value, "bootloader", "loader_type",
+            e.bootloader_name,
+            _("Bootloader is not supported on this architecture. Possible values: ") + 
+              possible_values.join(", "),
+            :fatal
+        )
+        return false
+      end
 
       Yast::PackagesProposal.AddResolvables("yast2-bootloader",
         :package, BootloaderFactory.current.packages)

diff --git a/src/lib/bootloader/autoyast_converter.rb b/src/lib/bootloader/autoyast_converter.rb
@@ -178,7 +178,7 @@ def import_custom_devices(data, stage1)
 
       def bootloader_from_data(data)
         loader_type = data["loader_type"] || "default"
-        allowed = BootloaderFactory::SUPPORTED_BOOTLOADERS + ["default"]
+        allowed = BootloaderFactory.supported_names + ["default"]
 
         raise UnsupportedBootloader, loader_type if !allowed.include?(loader_type)