From e74e5657b5e490e0de70d55560fe647399b22d87 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 30 Jan 2025 13:49:45 +0100 Subject: [PATCH 1/2] Calling -sdbootutil set-timeout- with the correct parameters --- package/yast2-bootloader.changes | 7 +++++++ package/yast2-bootloader.spec | 2 +- src/lib/bootloader/bls.rb | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index 0e772795d..5cc2ecac8 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 30 12:45:30 UTC 2025 - Stefan Schubert + +- Calling "sdbootutil set-timeout" with the correct parameters + (bsc#1236578). +- 5.0.15 + ------------------------------------------------------------------- Thu Jan 9 11:26:59 UTC 2025 - Stefan Schubert diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec index ffebaadb7..06c4dfe5d 100644 --- a/package/yast2-bootloader.spec +++ b/package/yast2-bootloader.spec @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 5.0.14 +Version: 5.0.15 Release: 0 Summary: YaST2 - Bootloader Configuration License: GPL-2.0-or-later diff --git a/src/lib/bootloader/bls.rb b/src/lib/bootloader/bls.rb index e47d54045..b582c55a3 100644 --- a/src/lib/bootloader/bls.rb +++ b/src/lib/bootloader/bls.rb @@ -47,7 +47,7 @@ def self.install_bootloader end def self.write_menu_timeout(timeout) - Yast::Execute.on_target!(SDBOOTUTIL, "set-timeout", timeout) + Yast::Execute.on_target!(SDBOOTUTIL, "set-timeout", "--", timeout) rescue Cheetah::ExecutionFailed => e Yast::Report.Error( format(_( From 5ce39ce5a37aede12b11da56a8b242cc6f4e6829 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 30 Jan 2025 13:56:41 +0100 Subject: [PATCH 2/2] fixed testcase --- test/bls_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bls_test.rb b/test/bls_test.rb index 9ed0a8343..31c5648a2 100644 --- a/test/bls_test.rb +++ b/test/bls_test.rb @@ -24,7 +24,7 @@ describe "#write_menu_timeout" do it "calls sdbootutil set-timeout" do expect(Yast::Execute).to receive(:on_target!) - .with("/usr/bin/sdbootutil", "set-timeout", + .with("/usr/bin/sdbootutil", "set-timeout", "--", 10) subject.write_menu_timeout(10) end