From ed82117f36e9f79c8054c9603428a00e0e5cc72b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 6 Mar 2024 09:59:54 +0100 Subject: [PATCH 1/2] replace mkinitrd with dracut --- src/lib/y2s390/dialogs/mkinitrd.rb | 6 +++--- src/modules/ZFCPController.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/y2s390/dialogs/mkinitrd.rb b/src/lib/y2s390/dialogs/mkinitrd.rb index 390593c5..d2973f1b 100644 --- a/src/lib/y2s390/dialogs/mkinitrd.rb +++ b/src/lib/y2s390/dialogs/mkinitrd.rb @@ -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 @@ -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 diff --git a/src/modules/ZFCPController.rb b/src/modules/ZFCPController.rb index 6d0f9cb9..ac385fb3 100644 --- a/src/modules/ZFCPController.rb +++ b/src/modules/ZFCPController.rb @@ -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) From 196cb64943c5c6e8c84fad24bb97efc8eac1b544 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 6 Mar 2024 10:00:53 +0100 Subject: [PATCH 2/2] changes --- package/yast2-s390.changes | 6 ++++++ package/yast2-s390.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes index 7df9823a..675191c9 100644 --- a/package/yast2-s390.changes +++ b/package/yast2-s390.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 6 09:00:01 UTC 2024 - Josef Reidinger + +- Replace 'mkinitrd' with dracut (bsc#1220995) +- 4.5.4 + ------------------------------------------------------------------- Wed May 10 13:35:34 UTC 2023 - Stefan Hundhammer diff --git a/package/yast2-s390.spec b/package/yast2-s390.spec index 5f609d22..716bd0c3 100644 --- a/package/yast2-s390.spec +++ b/package/yast2-s390.spec @@ -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