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
78 lines
2.7 KiB
Diff
78 lines
2.7 KiB
Diff
From 3a9b9a5cf507a868f8b3ec33cf686b3a552286c2 Mon Sep 17 00:00:00 2001
|
|
From: Steffen Maier <maier@linux.ibm.com>
|
|
Date: Sat, 28 Jan 2023 01:58:29 +0100
|
|
Subject: [PATCH 04/23] refactor(cms): use consolidated zfcp config with zdev
|
|
from s390-tools
|
|
|
|
This is just internal to initrd, so we can already migrate the code to
|
|
consolidated zfcp 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, or zfcp.
|
|
|
|
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
|
|
---
|
|
modules.d/80cms/cmssetup.sh | 21 ++++++++++++++++-----
|
|
modules.d/80cms/module-setup.sh | 2 +-
|
|
2 files changed, 17 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
|
|
index 23e81ca9..da42ec0f 100755
|
|
--- a/modules.d/80cms/cmssetup.sh
|
|
+++ b/modules.d/80cms/cmssetup.sh
|
|
@@ -117,7 +117,6 @@ processcmsfile() {
|
|
dasd_cio_free
|
|
fi
|
|
|
|
- unset _do_zfcp
|
|
for i in ${!FCP_*}; do
|
|
echo "${!i}" | while read -r port rest || [ -n "$port" ]; do
|
|
case $port in
|
|
@@ -130,12 +129,24 @@ processcmsfile() {
|
|
port="0.0.$port"
|
|
;;
|
|
esac
|
|
- echo "$port" "$rest" >> /etc/zfcp.conf
|
|
+ # shellcheck disable=SC2086
|
|
+ set -- $rest
|
|
+ SAVED_IFS="$IFS"
|
|
+ IFS=":"
|
|
+ # Intentionally do not dynamically activate now, but only generate udev
|
|
+ # rules, which activate the device later during udev coldplug.
|
|
+ if [[ -z $rest ]]; then
|
|
+ chzdev --enable --persistent \
|
|
+ --no-settle --yes --quiet --no-root-update --force \
|
|
+ zfcp-host "$port" 2>&1 | vinfo
|
|
+ else
|
|
+ chzdev --enable --persistent \
|
|
+ --no-settle --yes --quiet --no-root-update --force \
|
|
+ zfcp-lun "$port:$*" 2>&1 | vinfo
|
|
+ fi
|
|
+ IFS="$SAVED_IFS"
|
|
done
|
|
- _do_zfcp=1
|
|
done
|
|
- [[ $_do_zfcp ]] && zfcp_cio_free
|
|
- unset _do_zfcp
|
|
}
|
|
|
|
[[ $CMSDASD ]] || CMSDASD=$(getarg "CMSDASD=")
|
|
diff --git a/modules.d/80cms/module-setup.sh b/modules.d/80cms/module-setup.sh
|
|
index 4872734b..0dd86b80 100755
|
|
--- a/modules.d/80cms/module-setup.sh
|
|
+++ b/modules.d/80cms/module-setup.sh
|
|
@@ -12,7 +12,7 @@ check() {
|
|
depends() {
|
|
arch=${DRACUT_ARCH:-$(uname -m)}
|
|
[ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
|
|
- echo znet zfcp dasd dasd_mod bash
|
|
+ echo znet dasd dasd_mod bash
|
|
return 0
|
|
}
|
|
|
|
--
|
|
2.42.0
|
|
|