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
74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
From a82045ef34bc8c913502eba37b6b9c60709d6997 Mon Sep 17 00:00:00 2001
|
|
From: Steffen Maier <maier@linux.ibm.com>
|
|
Date: Thu, 23 Mar 2023 18:22:56 +0100
|
|
Subject: [PATCH 11/23] feat(dasd_mod): minimize dasd handling consolidated in
|
|
s390-tools
|
|
|
|
Parsing of rd.dasd is handled by s390-tools zdev dracut module 95zdev as of
|
|
https://github.com/ibm-s390-linux/s390-tools/commit/99270236805972544932feab9692ee7122a343b8
|
|
("zdev/dracut: add rd.dasd cmdline option handling").
|
|
|
|
Even though this removes one implementation of parsing rd.dasd in dracut,
|
|
above s390-tools change introduces another implementation of parsing the
|
|
exact same rd.dasd syntax. Therefore, it would be good to keep the
|
|
documentation in man/dracut.cmdline.7 of dracut as one central place
|
|
describing all s390 device types that dracut handles.
|
|
|
|
95dasd/modules-setup.sh copies /etc/dasd.conf from root-fs into initrd.
|
|
Retain the call of dasd_cio_free here so /etc/dasd.conf gets processed even
|
|
with the typical cio_ignore kernel boot parameter ignoring most devices.
|
|
|
|
Preparation for consolidating persistent configuration with zdev.
|
|
|
|
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
|
|
---
|
|
modules.d/95dasd_mod/module-setup.sh | 2 --
|
|
modules.d/95dasd_mod/parse-dasd-mod.sh | 14 --------------
|
|
2 files changed, 16 deletions(-)
|
|
|
|
diff --git a/modules.d/95dasd_mod/module-setup.sh b/modules.d/95dasd_mod/module-setup.sh
|
|
index c59dd3ac..155eaacc 100755
|
|
--- a/modules.d/95dasd_mod/module-setup.sh
|
|
+++ b/modules.d/95dasd_mod/module-setup.sh
|
|
@@ -4,7 +4,6 @@
|
|
check() {
|
|
local _arch=${DRACUT_ARCH:-$(uname -m)}
|
|
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
|
|
- require_binaries grep sed seq
|
|
|
|
return 0
|
|
}
|
|
@@ -22,6 +21,5 @@ installkernel() {
|
|
# called by dracut
|
|
install() {
|
|
inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh"
|
|
- inst_multiple grep sed seq
|
|
inst_multiple -o dasd_cio_free
|
|
}
|
|
diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
|
|
index 2b86d454..b635ecf9 100755
|
|
--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
|
|
+++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
|
|
@@ -1,18 +1,4 @@
|
|
#!/bin/sh
|
|
-mod_args=""
|
|
-
|
|
-for dasd_arg in $(getargs rd.dasd= -d rd_DASD= DASD=); do
|
|
- mod_args="$mod_args,$dasd_arg"
|
|
-done
|
|
-
|
|
-mod_args="${mod_args#*,}"
|
|
-
|
|
-if [ -x /sbin/dasd_cio_free -a -n "$mod_args" ]; then
|
|
- [ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
|
|
- echo "options dasd_mod dasd=$mod_args" >> /etc/modprobe.d/dasd_mod.conf
|
|
-fi
|
|
-
|
|
-unset dasd_arg
|
|
if [ -x /sbin/dasd_cio_free ]; then
|
|
dasd_cio_free
|
|
fi
|
|
--
|
|
2.42.0
|
|
|