Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Calling -sdbootutil set-timeout- with the correct parameters #711

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Calling -sdbootutil set-timeout- with the correct parameters #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e74e565
Calling -sdbootutil set-timeout- with the correct parameters
schubi2 Jan 30, 2025
5ce39ce
fixed testcase
schubi2 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-bootloader.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 30 12:45:30 UTC 2025 - Stefan Schubert <[email protected]>

- Calling "sdbootutil set-timeout" with the correct parameters
(bsc#1236578).
- 5.0.15

-------------------------------------------------------------------
Thu Jan 9 11:26:59 UTC 2025 - Stefan Schubert <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-bootloader.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/bootloader/bls.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(_(
Expand Down
2 changes: 1 addition & 1 deletion test/bls_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down