grub2bls

src/lib/bootloader/bls_sections.rb

@@ -63,10 +63,9 @@ def grubenv_path
     # @return [String] return default boot as string or "" if not set
     # or something goes wrong
     def read_default
-      # Execute.on_target can return nil if call failed.
-      str = Yast::Execute.on_target("/usr/bin/grub2-editenv", grubenv_path,
-                                    "list", "default", stdout: :capture) || ""
-      @default = str.split("=").last
+      @default = Yast::Misc.CustomSysconfigRead("default", "",
+                                                grubenv_path)
+      log.info "Default boot entry: #{@default}"
     end
 
     # write default entry

src/lib/bootloader/grub2bls.rb

@@ -80,7 +80,6 @@ def packages
   private
 
     SDBOOTUTIL = "/usr/bin/sdbootutil".freeze
-    CMDLINE = "/etc/kernel/cmdline".freeze
     OS_RELEASE_PATH = "/etc/os-release".freeze
 
     def grubenv_path
@@ -93,10 +92,8 @@ def grubenv_path
     # @return [String] return default boot as string or "" if not set
     # or something goes wrong
     def read_menu_timeout
-      # Execute.on_target can return nil if call failed.
-      str = Yast::Execute.on_target("/usr/bin/grub2-editenv", grubenv_path,
-                                    "list", "timeout", stdout: :capture) || ""
-      grub_default.timeout = str.split("=").last
+      grub_default.timeout = Yast::Misc.CustomSysconfigRead("timeout", "",
+                                                            grubenv_path)
       log.info "Boot timeout: #{grub_default.timeout}"
     end
 
@@ -112,7 +109,6 @@ def merge_sections(other)
     end
 
     def create_menu_entries
-
       begin
         Yast::Execute.on_target!(SDBOOTUTIL, "--verbose", "add-all-kernels")
       rescue Cheetah::ExecutionFailed => e