cleanup

yast · Jun 26, 2023 · 36dc7e6 · 36dc7e6
1 parent c2f0f07
commit 36dc7e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/SUPPORTED_SCENARIOS.md b/SUPPORTED_SCENARIOS.md
@@ -81,6 +81,7 @@ This option requires packages based on the architecture of the system:
 
 ## systemd-boot
 If you're running a multiboot EFI system, systemd-boot can provide easier boot management and may even reduce your boot times.
+Systemd-boot will be supported on x86_64 EFI architecture only.
 
 ## none
 This option has no additional package requirement.
diff --git a/src/lib/bootloader/autoyast_converter.rb b/src/lib/bootloader/autoyast_converter.rb
@@ -33,7 +33,8 @@ def import(data)
         bootloader = bootloader_from_data(data)
         return bootloader if bootloader.name == "none"
 
-        if ["grub2", "grub2-efi"].include?(bootloader.name)
+        case bootloader.name
+        when "grub2", "grub2-efi"
           import_grub2(data, bootloader)
           import_grub2efi(data, bootloader)
           import_stage1(data, bootloader)
@@ -47,10 +48,11 @@ def import(data)
           if cpu_mitigations
             bootloader.cpu_mitigations = CpuMitigations.from_string(cpu_mitigations)
           end
-        end
-        if bootloader.name == "systemd-boot"
+        when "systemd-boot"
           bootloader.menue_timeout = data.global.timeout
           bootloader.secure_boot = data.global.secure_boot
+        else
+          raise UnsupportedBootloader, bootloader.name
         end
         # TODO: import Initrd
         log.warn "autoyast profile contain sections which won't be processed" if data.sections
@@ -69,17 +71,19 @@ def export(config)
 
         res["global"] = {}
 
-        if ["grub2", "grub2-efi"].include?(config.name)
+        case config.name
+        when "grub2", "grub2-efi"
           global = res["global"]
           export_grub2(global, config) if config.name == "grub2"
           export_grub2efi(global, config) if config.name == "grub2-efi"
           export_default(global, config.grub_default)
           export_password(global, config.password)
           res["global"]["cpu_mitigations"] = config.cpu_mitigations.value.to_s
-        end
-        if config.name == "systemd-boot"
+        when "systemd-boot"
           res["global"]["timeout"] = config.menue_timeout
           res["global"]["secure_boot"] = config.secure_boot
+        else
+          raise UnsupportedBootloader, bootloader.name
         end
         # Do not export device map as device name are very unpredictable and is used only as
         # work-around when automatic ones do not work for what-ever reasons ( it can really safe