From 77e8cf1ec112dd07f66281d03b41e7bd3b79d1f7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 1 Sep 2023 22:30:16 +0200 Subject: [PATCH 1/6] Bump version to 4.6.0 --- package/yast2-s390.changes | 5 +++++ package/yast2-s390.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes index 7df9823a..35886400 100644 --- a/package/yast2-s390.changes +++ b/package/yast2-s390.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger + +- Branch package for SP6 (bsc#1208913) + ------------------------------------------------------------------- Wed May 10 13:35:34 UTC 2023 - Stefan Hundhammer diff --git a/package/yast2-s390.spec b/package/yast2-s390.spec index 5f609d22..98559be5 100644 --- a/package/yast2-s390.spec +++ b/package/yast2-s390.spec @@ -17,7 +17,7 @@ Name: yast2-s390 -Version: 4.5.3 +Version: 4.6.0 Release: 0 Group: System/YaST License: GPL-2.0-only From f7f7813046e2325643e95b51dd4132f4ec997753 Mon Sep 17 00:00:00 2001 From: Steffen Maier Date: Thu, 9 Mar 2023 14:38:55 +0100 Subject: [PATCH 2/6] onpanic: add support for multipathed zfcp-attached SCSI disks Depends on https://build.opensuse.org/package/show/Base:System/s390-tools commit ("mkdump: add support for multipathed zfcp-attached SCSI disks") from SUSE bug 1216257. Users should use multipathing for all zfcp-attached SCSI disks. Since a long time, zipl can write the partition-based zfcpdump standalone dumper boot record to a multipath device. This avoids users having to flush multipath maps or maintain a multipath exception list just for zfcp dump volumes. Always having multipathing for everything also provides redundant access to the dump volume on importing the dump from the volume into a filesystem after the standalone dumper had written the dump. An updated mkdump.pl from SUSE s390-tools understands and lists such multipath devices. Make "yast onpanic" understand /dev/mapper/... multipath devices as better alternative to single path SCSI disks /dev/sd[a-z]+. Fixes SUSE bug 1020336. Signed-off-by: Steffen Maier --- src/modules/OnPanic.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/OnPanic.rb b/src/modules/OnPanic.rb index d10b9bc6..7fde6317 100644 --- 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 From e9f264bcb1dcdc179b4d7cdbd29e08432ab75d11 Mon Sep 17 00:00:00 2001 From: Steffen Maier Date: Tue, 12 Dec 2023 15:42:52 +0100 Subject: [PATCH 3/6] Version and changelog Signed-off-by: Steffen Maier --- package/yast2-s390.changes | 8 ++++++++ package/yast2-s390.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes index 35886400..f50d271f 100644 --- a/package/yast2-s390.changes +++ b/package/yast2-s390.changes @@ -1,7 +1,15 @@ +------------------------------------------------------------------- +Tue Dec 12 14:35:37 UTC 2023 - Steffen Maier + +- onpanic: add support for multipathed zfcp-attached SCSI disks + (bsc#1020336, also related to bsc#1216257). +- 4.6.1 + ------------------------------------------------------------------- Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger - Branch package for SP6 (bsc#1208913) +- 4.6.0 ------------------------------------------------------------------- Wed May 10 13:35:34 UTC 2023 - Stefan Hundhammer diff --git a/package/yast2-s390.spec b/package/yast2-s390.spec index 98559be5..b1a7b5ac 100644 --- a/package/yast2-s390.spec +++ b/package/yast2-s390.spec @@ -17,7 +17,7 @@ Name: yast2-s390 -Version: 4.6.0 +Version: 4.6.1 Release: 0 Group: System/YaST License: GPL-2.0-only From 68c51e2b4f7030ed3fb1bdb11a7f7c5538a8137a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Wed, 13 Dec 2023 18:42:28 +0000 Subject: [PATCH 4/6] Fix version bumping it to 4.6.5 To avoid collisions with changes already send to master branch as 4.6.0, 4.6.1, 4.6.2, 4.6.3, and 4.6.4. --- package/yast2-s390.changes | 3 +-- package/yast2-s390.spec | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes index f50d271f..5614f9ff 100644 --- a/package/yast2-s390.changes +++ b/package/yast2-s390.changes @@ -3,13 +3,12 @@ Tue Dec 12 14:35:37 UTC 2023 - Steffen Maier - onpanic: add support for multipathed zfcp-attached SCSI disks (bsc#1020336, also related to bsc#1216257). -- 4.6.1 +- 4.6.5 ------------------------------------------------------------------- Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger - Branch package for SP6 (bsc#1208913) -- 4.6.0 ------------------------------------------------------------------- Wed May 10 13:35:34 UTC 2023 - Stefan Hundhammer diff --git a/package/yast2-s390.spec b/package/yast2-s390.spec index b1a7b5ac..b4b6740a 100644 --- a/package/yast2-s390.spec +++ b/package/yast2-s390.spec @@ -17,7 +17,7 @@ Name: yast2-s390 -Version: 4.6.1 +Version: 4.6.5 Release: 0 Group: System/YaST License: GPL-2.0-only From ed82117f36e9f79c8054c9603428a00e0e5cc72b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 6 Mar 2024 09:59:54 +0100 Subject: [PATCH 5/6] 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 6/6] 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