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

…l_master
yast · Mar 6, 2024 · 43d8603 · 43d8603
2 parents e44c38c + fce6d05
commit 43d8603
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Mar  6 09:00:01 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
+
+- Replace 'mkinitrd' with dracut (bsc#1220995)
+- 5.0.1
+
+-------------------------------------------------------------------
+Tue Dec 12 14:35:37 UTC 2023 - Steffen Maier <maier@linux.ibm.com>
+
+- onpanic: add support for multipathed zfcp-attached SCSI disks
+  (bsc#1020336, also related to bsc#1216257).
+
 -------------------------------------------------------------------
 Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <jreidinger@suse.cz>
 

diff --git a/package/yast2-s390.spec b/package/yast2-s390.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-s390
-Version:        5.0.0
+Version:        5.0.1
 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/OnPanic.rb b/src/modules/OnPanic.rb
@@ -95,7 +95,7 @@ def ConvertMkdumpToConf(dev_line)
         Ops.get(entry, 0),
         "^/dev/dasd[[:lower:]]+$"
       )
-      is_zfcp = Builtins.regexpmatch(Ops.get(entry, 0), "^/dev/sd[[:lower:]]+$")
+      is_zfcp = Builtins.regexpmatch(Ops.get(entry, 0), "^/dev/(sd[[:lower:]]+|mapper/.*)$")
 
       if is_dasd
         dev = Builtins.add(dev, "DUMP_TYPE", "ccw")
@@ -135,7 +135,7 @@ def ConvertConfToMkdump(dev)
             Ops.get(line, 2) == Ops.get(dev, "DEVICE") ||
             # check for fitting zfcp
             type == "fcp" &&
-                Builtins.regexpmatch(Ops.get(line, 0), "^/dev/sd[[:lower:]]+") &&
+                Builtins.regexpmatch(Ops.get(line, 0), "^/dev/(sd[[:lower:]]+|mapper/)") &&
                 Ops.get(line, 2) == Ops.get(dev, "DEVICE") &&
                 Ops.get(line, 3) == Ops.get(dev, "WWPN") &&
                 Ops.get(line, 4) == Ops.get(dev, "LUN") # check for fitting dasd

diff --git a/src/modules/ZFCPController.rb b/src/modules/ZFCPController.rb
@@ -157,9 +157,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)