From 24e7ad4ed92e825da1a3ede6b7c58a12bef01d16 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 11 Jan 2024 11:01:59 +0100 Subject: [PATCH] Merge SLE15 SP6 branch --- package/yast2-bootloader.changes | 8 ++++++++ package/yast2-bootloader.spec | 2 +- src/lib/bootloader/bootloader_factory.rb | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index 2ae859d40..2c698cd05 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 10 23:16:39 UTC 2024 - Josef Reidinger + +- 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 diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec index 61b65ffeb..3247b9e13 100644 --- 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 index 45be6e473..656fe5a2a 100644 --- 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