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.

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

Mkinitrd removal sp5 #109

Merged
merged 2 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions package/yast2-s390.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 6 09:00:01 UTC 2024 - Josef Reidinger <[email protected]>

- Replace 'mkinitrd' with dracut (bsc#1220995)
- 4.5.4

-------------------------------------------------------------------
Wed May 10 13:35:34 UTC 2023 - Stefan Hundhammer <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-s390.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-s390
Version: 4.5.3
Version: 4.5.4
Release: 0
Group: System/YaST
License: GPL-2.0-only
Expand Down
6 changes: 3 additions & 3 deletions src/lib/y2s390/dialogs/mkinitrd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
module Y2S390
module Dialogs
class Mkinitrd < ::UI::Dialog
CMD = "/sbin/mkinitrd".freeze
CMD = ["/usr/bin/dracut", "--force"].freeze

def dialog_content
textdomain "s390"
Label(_("Running mkinitrd."))
Label(_("Running dracut."))
end

def self.run
Expand All @@ -16,7 +16,7 @@ def self.run

def run
create_dialog
Yast::Execute.on_target(CMD)
Yast::Execute.on_target(*CMD)
close_dialog
end
end
Expand Down
4 changes: 2 additions & 2 deletions src/modules/ZFCPController.rb
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ def Write
if !Mode.installation
if @disk_configured
# popup label
UI.OpenDialog(Label(_("Running mkinitrd.")))
UI.OpenDialog(Label(_("Running dracut.")))

command = "/sbin/mkinitrd"
command = "/usr/bin/dracut --force"
Builtins.y2milestone("Running command %1", command)
ret = SCR.Execute(path(".target.bash"), command)
Builtins.y2milestone("Exit code: %1", ret)
Expand Down
Loading