- zdev/dracut: fix kdump build to integrate with site support (#2229177)
- Resolves: #2229177
This commit is contained in:
Dan Horák
parent
0058b6f7b4
commit
d20fcaec40
@ -1,7 +1,7 @@
|
||||
From 368c5581b8e7f9f796764c3f697babd63d637767 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Haberland <sth@linux.ibm.com>
|
||||
Date: Mon, 8 May 2023 14:52:54 +0200
|
||||
Subject: [PATCH 1/6] zdev: add support for autoquiesce related sysfs
|
||||
Subject: [PATCH 1/7] zdev: add support for autoquiesce related sysfs
|
||||
attributes (#2196517)
|
||||
|
||||
Autoquiesce is a mechanism that tells Linux to stop issuing I/Os to a
|
||||
@ -106,13 +106,13 @@ index f9fd231..4330229 100644
|
||||
),
|
||||
.unknown_dev_attribs = 1,
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
||||
From 21a9e00ffeb5ef885ad52b73f2724cef6d1ae73d Mon Sep 17 00:00:00 2001
|
||||
From: Vineeth Vijayan <vneethv@linux.ibm.com>
|
||||
Date: Wed, 7 Jun 2023 14:10:56 +0200
|
||||
Subject: [PATCH 2/6] zdev: add proper value input for the ZDEV_SITE_ID key
|
||||
Subject: [PATCH 2/7] zdev: add proper value input for the ZDEV_SITE_ID key
|
||||
(#2223304)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -186,13 +186,13 @@ index c341d31..9ad9961 100644
|
||||
printf("ZDEV_SITE_ID=%d\n", site_id);
|
||||
}
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
||||
From 90bab830c617cbecdc51ef9f6f2a19d14e6445c5 Mon Sep 17 00:00:00 2001
|
||||
From: Vineeth Vijayan <vneethv@linux.ibm.com>
|
||||
Date: Wed, 7 Jun 2023 14:10:57 +0200
|
||||
Subject: [PATCH 3/6] zdev: use rename-file to avoid any symlinks created
|
||||
Subject: [PATCH 3/7] zdev: use rename-file to avoid any symlinks created
|
||||
(#2223304)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -254,13 +254,13 @@ index 9ad9961..2464b16 100644
|
||||
err:
|
||||
err(1, "Could not write to zdev_site_id file");
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
||||
From 5e9a117d1da306ad13b46612b709d769c792baae Mon Sep 17 00:00:00 2001
|
||||
From: Vineeth Vijayan <vneethv@linux.ibm.com>
|
||||
Date: Mon, 19 Jun 2023 11:32:15 +0200
|
||||
Subject: [PATCH 4/6] zdev: add missing label in the udev-rules (#2222900)
|
||||
Subject: [PATCH 4/7] zdev: add missing label in the udev-rules (#2222900)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@ -292,13 +292,13 @@ index 3375a5e..1881337 100644
|
||||
write_attr_to_file(fd, state, id);
|
||||
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
||||
From 17d87f75f0e461429962f312fe3bf73ecd7d353a Mon Sep 17 00:00:00 2001
|
||||
From: Harald Freudenberger <freude@linux.ibm.com>
|
||||
Date: Wed, 17 May 2023 11:43:08 +0200
|
||||
Subject: [PATCH 5/6] lszcrypt: Support for SE AP pass-through support
|
||||
Subject: [PATCH 5/7] lszcrypt: Support for SE AP pass-through support
|
||||
(#2110521)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -954,13 +954,13 @@ index 502a687..92cf453 100644
|
||||
|
||||
#endif /* MISC_H */
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
||||
From f5c3fabce59c71fb9fbf2d21ab4bbf909c2653b5 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Freudenberger <freude@linux.ibm.com>
|
||||
Date: Wed, 17 May 2023 13:13:09 +0200
|
||||
Subject: [PATCH 6/6] chzcrypt: Support for SE bind, unbind and associate
|
||||
Subject: [PATCH 6/7] chzcrypt: Support for SE bind, unbind and associate
|
||||
(#2110521)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -1515,5 +1515,64 @@ index 68b36a5..b04bcfa 100644
|
||||
dev_list_all(&dev_list, &len);
|
||||
else
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
||||
From a2a364b456185eebca87f43b280c4f25b323f65b Mon Sep 17 00:00:00 2001
|
||||
From: Steffen Maier <maier@linux.ibm.com>
|
||||
Date: Tue, 1 Aug 2023 18:58:45 +0200
|
||||
Subject: [PATCH 7/7] zdev/dracut: fix kdump build to integrate with site
|
||||
support (#2229177)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This complements v2.27.0 commit 73c46a30563d ("zdev/dracut: fix kdump by
|
||||
only activating required devices"). On older distributions, the absence of
|
||||
zdev_id can cause the following harmless error messages for each udev
|
||||
event:
|
||||
|
||||
(spawn)[387]: failed to execute '/lib/s390-tools/zdev_id' \
|
||||
'/lib/s390-tools/zdev_id': No such file or directory
|
||||
|
||||
Kdump is still functional nonetheless.
|
||||
|
||||
As of v2.24.0 commit 2e89722ef0ec ("zdev: make site specific udev-rule for
|
||||
ccw"), the invocations of chzdev within
|
||||
zdev/dracut/95zdev-kdump/module-setup.sh generate
|
||||
/etc/udev/rules.d/40-zdev-id.rules. And so even though zdev-kdump
|
||||
intentionally does not install zdev_id and its previous singular user
|
||||
zdev/udev/81-dpm.rules into the kdump initrd, because DPM device auto
|
||||
configuration is not desired in the kdump environment, zdev_id meanwhile
|
||||
has an additional functionality for site-support and the generated
|
||||
40-zdev-id.rules calls /lib/s390-tools/zdev_id. By installing zdev_id into
|
||||
the kdump initrd, 40-zdev-id.rules can work without error.
|
||||
|
||||
Fixes: 73c46a30563d ("zdev/dracut: fix kdump by only activating required devices")
|
||||
Reviewed-by: Alexander Egorenkov <egorenar@linux.ibm.com>
|
||||
Reviewed-by: Vineeth Vijayan <vneethv@linux.ibm.com>
|
||||
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
|
||||
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
|
||||
(cherry picked from commit 4b486e87cc2875f532784bd69ee680e714508059)
|
||||
---
|
||||
zdev/dracut/95zdev-kdump/module-setup.sh | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/zdev/dracut/95zdev-kdump/module-setup.sh b/zdev/dracut/95zdev-kdump/module-setup.sh
|
||||
index ad8e309..4ce2fc6 100755
|
||||
--- a/zdev/dracut/95zdev-kdump/module-setup.sh
|
||||
+++ b/zdev/dracut/95zdev-kdump/module-setup.sh
|
||||
@@ -46,6 +46,10 @@ installkernel() {
|
||||
install() {
|
||||
local _tempfile
|
||||
|
||||
+ # zdev_id is not functionally required for kdump but optionally
|
||||
+ # installing avoids error messages from zdev site udev rule processing
|
||||
+ inst_multiple -o /lib/s390-tools/zdev_id
|
||||
+
|
||||
# Obtain kdump target device configuration
|
||||
|
||||
_tempfile=$(mktemp --tmpdir dracut-zdev.XXXXXX)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
Name: s390utils
|
||||
Summary: Utilities and daemons for IBM z Systems
|
||||
Version: 2.27.0
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Epoch: 2
|
||||
License: MIT
|
||||
ExclusiveArch: s390 s390x
|
||||
@ -898,6 +898,10 @@ User-space development files for the s390/s390x architecture.
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 7 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-4
|
||||
- zdev/dracut: fix kdump build to integrate with site support (#2229177)
|
||||
- Resolves: #2229177
|
||||
|
||||
* Thu Jul 20 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-3
|
||||
- Secure Execution APQN binding and IBK association (#2110521)
|
||||
- Resolves: #2110521
|
||||
|
||||
Loading…
Reference in New Issue
Block a user