Merge SLE15 SP6 branch

yast · Jan 11, 2024 · 24e7ad4 · 24e7ad4
1 parent 0ccf079
commit 24e7ad4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 10 23:16:39 UTC 2024 - Josef Reidinger <[email protected]>
+
+- Do not try finding undefined bootloader name to avoid error
+  in logs (bsc#1218700)
+- 5.0.3
+
+
 -------------------------------------------------------------------
 Mon Sep  4 06:40:19 UTC 2023 - Stefan Schubert <[email protected]>
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        5.0.2
+Version:        5.0.3
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

diff --git a/src/lib/bootloader/bootloader_factory.rb b/src/lib/bootloader/bootloader_factory.rb
@@ -35,7 +35,10 @@ def proposed
       end
 
       def system
-        bootloader_by_name(Sysconfig.from_system.bootloader)
+        sysconfig_name = Sysconfig.from_system.bootloader
+        return nil unless sysconfig_name
+
+        bootloader_by_name(sysconfig_name)
       end
 
       def current