Merge remote-tracking branch 'origin/SLE-15-SP5' into mkinitrd_remova…

…l_sp6
yast · Mar 6, 2024 · 69fe852 · 69fe852
2 parents 1a20b8f + f7a9860
commit 69fe852
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar  6 09:00:01 UTC 2024 - Josef Reidinger <[email protected]>
+
+- Replace 'mkinitrd' with dracut (bsc#1220995)
+- 4.6.6
+
 -------------------------------------------------------------------
 Tue Dec 12 14:35:37 UTC 2023 - Steffen Maier <[email protected]>
 

diff --git a/package/yast2-s390.spec b/package/yast2-s390.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-s390
-Version:        4.6.5
+Version:        4.6.6
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

diff --git 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
@@ -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)