From 51c2776a32f8a94d195072f9de8b50a5264eb55f90a51ddb4094389f91861922 Mon Sep 17 00:00:00 2001 From: Nikolay Gueorguiev Date: Wed, 21 Feb 2024 16:55:23 +0000 Subject: [PATCH 1/2] Accepting request 1148512 from home:oertel:branches:Base:System - Provide groups as required by RPM 4.19 OBS-URL: https://build.opensuse.org/request/show/1148512 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=194 --- s390-tools.changes | 5 +++++ s390-tools.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/s390-tools.changes b/s390-tools.changes index 54f2737..7182313 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 11:12:33 CET 2024 - ro@suse.de + +- Provide groups as required by RPM 4.19 + ------------------------------------------------------------------- Wed Feb 7 07:55:51 UTC 2024 - Nikolay Gueorguiev diff --git a/s390-tools.spec b/s390-tools.spec index a97224a..43e6ed7 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -198,6 +198,9 @@ Requires(post): permissions Requires(pre): shadow Recommends: blktrace Provides: s390utils:/sbin/dasdfmt +Provides: group(cpacfstats) +Provides: group(ts-shell) +Provides: group(zkeyadm) ExclusiveArch: s390x x86_64 %description From 0d94837b975a00e982ab7f625744668673eea1b6001016fb2231369ea1463603 Mon Sep 17 00:00:00 2001 From: Nikolay Gueorguiev Date: Wed, 21 Feb 2024 17:20:17 +0000 Subject: [PATCH 2/2] Accepting request 1148818 from home:ngueorguiev:branches:Base:System - Applied a patch for kdump initrd (bsc#1219471) * s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch OBS-URL: https://build.opensuse.org/request/show/1148818 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=195 --- ...p6-kdump-initrd-59-zfcp-compat-rules.patch | 24 +++++++++++++++++++ s390-tools.changes | 6 +++++ s390-tools.spec | 1 + 3 files changed, 31 insertions(+) create mode 100644 s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch diff --git a/s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch b/s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch new file mode 100644 index 0000000..ed5f356 --- /dev/null +++ b/s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch @@ -0,0 +1,24 @@ +From: Jiri Bohac +References: bsc#1219471 +Subject: include 59-zfcp-compat.rules in kdump initrd + +kdump uses a random one of the by-path symlinks to refer to the target +partition. + +With 59-zfcp-compat.rules added to the SUSE package, symlinks in the form +/dev/disk/by-path/ccw-*.*.*-zfcp-*:*-part* are created. If kdump uses this symlink when generating +the kdump initrd it will fail on boot beacause the udev rule is missing in the kdump initrd +and the symlink not created in the kdump environment. + +Fix this by including 59-zfcp-compat.rules in the kdump initrd. + +--- a/zdev/dracut/95zdev-kdump/module-setup.sh 2024-02-21 15:57:33.027658387 +0100 ++++ b/zdev/dracut/95zdev-kdump/module-setup.sh 2024-02-21 15:57:38.215675799 +0100 +@@ -78,6 +78,7 @@ + inst_multiple /lib/s390-tools/zdev-from-dasd_mod.dasd + + inst_rules "59-dasd.rules" ++ inst_rules "59-zfcp-compat.rules" + + # Obtain kdump target device configuration + diff --git a/s390-tools.changes b/s390-tools.changes index 7182313..b9c2c0d 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 21 17:02:55 UTC 2024 - Nikolay Gueorguiev + +- Applied a patch for kdump initrd (bsc#1219471) + * s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch + ------------------------------------------------------------------- Wed Feb 21 11:12:33 CET 2024 - ro@suse.de diff --git a/s390-tools.spec b/s390-tools.spec index 43e6ed7..b9ec7c3 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -152,6 +152,7 @@ Patch909: s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl Patch910: s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.patch Patch911: s390-tools-sles15sp5-remove-no-pie-link-arguments.patch Patch912: s390-tools-ALP-zdev-live.patch +Patch913: s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch ### BuildRequires: curl-devel