e4f609fba2
From-source-git-commit: a24e1272faba2875f9b78fcf42109028af0869bc * switch to dracut-ng upstream fork The original dracut repository is no longer maintained, new initiative was started: https://github.com/dracut-ng/dracut-ng/ * applied additional fixes 9df3cb58a19f38157a615c311356cfd6ae55d2d7 fix(rngd): install system service file 0b65ac224d831cc96da940cce510523c7276a5ec feat(hwdb): add hwdb module to install hwdb.bin on demand 10b86edba3ffe0ce13c5f43ff0193cdf04661358 fix(nvmf): move /etc/nvme/host{nqn,id} requirement to hostonly bad2bc80cdcfac8915374497cc47ce9d5670d015 fix(systemd): explicitly install some libs that will not be statically included 55a56c546bde71fb42c99aadd96e98fca2199823 fix(dracut): move hooks directory from /usr/lib to /var/lib 110fec3e41faf47277447f1c56635c5a876c1f96 feat(ifcfg): minimize s390-specific network configuration aspects b6913f66b6c9e9ea81fd0832405c170876bc993a refactor(ifcfg): delete code duplication using iface_get_subchannels() cbc5eece88b8f6d0e69fdfbb8f34eabb45425c86 fix(znet): append to udev rules so each rd.znet_ifname is effective 7ad6fef8fe110093939c422b5c3b381ebe47e4e9 feat(qeth_rules): remove qeth handling consolidated in 95znet addb383b375fd0db07eacf8a9f5d9b4e23343855 docs(dracut.cmdline): generalize description of rd.znet 86b6e2979999cf5ecce8c76c6230d1f085b3a333 feat(znet): use zdev for consolidated device configuration 1ff6be8aef787513b8143df444a1dd2d696b0944 feat(dasd): minimize dasd handling consolidated in s390-tools a82045ef34bc8c913502eba37b6b9c60709d6997 feat(dasd_mod): minimize dasd handling consolidated in s390-tools 7294e45b5204e47bb8ee2108e2c38c5843e64fac feat(dasd_rules): remove dasd handling consolidated in s390-tools 8d6098969aa9dc34edfd1bc96e6aa0384ae2fb99 feat(zfcp): minimize zfcp handling consolidated in s390-tools 71876ea8c73090741bdf26abb89c28fb260ed575 feat(zfcp_rules): remove zfcp handling consolidated in s390-tools a2c1fc530d8bcbdeaf1806f4a22019052715fc98 refactor(cms): remove now unnecessary inclusion of full s390utils-base cc14fe218861f2855ca88ad03220ecb78d4aa31a refactor(cms): use consolidated network config with zdev from s390-tools 74edb9758da26ef063e4686a595f1d34f07f86f7 refactor(cms): use consolidated dasd config with zdev from s390-tools 3a9b9a5cf507a868f8b3ec33cf686b3a552286c2 refactor(cms): use consolidated zfcp config with zdev from s390-tools 38412977daad049b12273966300d07211674834e refactor(cms): use zdev to simplify handling CMSDASD=... boot option (Possibly also resolves other open issues.) Resolves: RHEL-26887 RHEL-34954 RHEL-35521
82 lines
2.9 KiB
Diff
82 lines
2.9 KiB
Diff
From 74edb9758da26ef063e4686a595f1d34f07f86f7 Mon Sep 17 00:00:00 2001
|
|
From: Steffen Maier <maier@linux.ibm.com>
|
|
Date: Wed, 24 May 2023 19:04:48 +0200
|
|
Subject: [PATCH 05/23] refactor(cms): use consolidated dasd config with zdev
|
|
from s390-tools
|
|
|
|
Depends on https://github.com/ibm-s390-linux/s390-tools commit
|
|
9b2fb1d4d2e2 ("zdev: add helper to convert from dasd_mod.dasd to zdev
|
|
config").
|
|
|
|
This is just internal to initrd, so it's possible to migrate the code to
|
|
consolidated dasd device configuration with zdev
|
|
https://github.com/ibm-s390-linux/s390-tools/tree/master/zdev/.
|
|
The code change is transparent to users after dracut switch root.
|
|
|
|
The generated persistent config of chzdev are pure udev rules so it has no
|
|
dependency on other dracut modules such as zdev, dasd, or dasd_mod.
|
|
Instead now install the corresponding kernel device drivers here directly.
|
|
|
|
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
|
|
---
|
|
modules.d/80cms/cmssetup.sh | 6 +++---
|
|
modules.d/80cms/module-setup.sh | 6 +++---
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
|
|
index da42ec0f..01cfd303 100755
|
|
--- a/modules.d/80cms/cmssetup.sh
|
|
+++ b/modules.d/80cms/cmssetup.sh
|
|
@@ -1,6 +1,7 @@
|
|
#!/bin/bash
|
|
|
|
type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
|
|
+type zdev_parse_dasd_list > /dev/null 2>&1 || . /lib/s390-tools/zdev-from-dasd_mod.dasd
|
|
|
|
function dasd_settle() {
|
|
local dasd_status
|
|
@@ -112,9 +113,8 @@ processcmsfile() {
|
|
fi
|
|
|
|
if [[ $DASD ]] && [[ $DASD != "none" ]]; then
|
|
- echo "$DASD" | normalize_dasd_arg > /etc/dasd.conf
|
|
- echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf
|
|
- dasd_cio_free
|
|
+ echo "$DASD" | zdev_parse_dasd_list globals 2>&1 | vinfo
|
|
+ echo "$DASD" | zdev_parse_dasd_list ranges 2>&1 | vinfo
|
|
fi
|
|
|
|
for i in ${!FCP_*}; do
|
|
diff --git a/modules.d/80cms/module-setup.sh b/modules.d/80cms/module-setup.sh
|
|
index 0dd86b80..05b049da 100755
|
|
--- a/modules.d/80cms/module-setup.sh
|
|
+++ b/modules.d/80cms/module-setup.sh
|
|
@@ -12,13 +12,13 @@ check() {
|
|
depends() {
|
|
arch=${DRACUT_ARCH:-$(uname -m)}
|
|
[ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
|
|
- echo znet dasd dasd_mod bash
|
|
+ echo znet bash
|
|
return 0
|
|
}
|
|
|
|
# called by dracut
|
|
installkernel() {
|
|
- instmods zfcp
|
|
+ instmods zfcp dasd_mod dasd_eckd_mod dasd_fba_mod dasd_diag_mod
|
|
}
|
|
|
|
# called by dracut
|
|
@@ -28,7 +28,7 @@ install() {
|
|
inst_script "$moddir/cmsifup.sh" /sbin/cmsifup
|
|
# shellcheck disable=SC2046
|
|
inst_multiple /etc/cmsfs-fuse/filetypes.conf /etc/udev/rules.d/99-fuse.rules /etc/fuse.conf \
|
|
- cmsfs-fuse fusermount bash insmod rmmod cat normalize_dasd_arg sed \
|
|
+ cmsfs-fuse fusermount bash insmod rmmod cat /lib/s390-tools/zdev-from-dasd_mod.dasd sed \
|
|
$(rpm -ql s390utils-base) awk getopt chzdev lszdev
|
|
|
|
inst_libdir_file "gconv/*"
|
|
--
|
|
2.42.0
|
|
|