From 284e3c6ff2effcd4aa63f404209e385c1a8abb77 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <schubi@suse.de>
Date: Wed, 6 Nov 2024 09:46:01 +0100
Subject: [PATCH] grub2bls

---
 src/lib/bootloader/bls_sections.rb | 7 +++----
 src/lib/bootloader/grub2bls.rb     | 8 ++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/lib/bootloader/bls_sections.rb b/src/lib/bootloader/bls_sections.rb
index ca8c9d3eb..5a0c45c86 100644
--- a/src/lib/bootloader/bls_sections.rb
+++ b/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
diff --git a/src/lib/bootloader/grub2bls.rb b/src/lib/bootloader/grub2bls.rb
index f6a1bcda4..b51298c88 100644
--- a/src/lib/bootloader/grub2bls.rb
+++ b/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