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
91 lines
2.5 KiB
Diff
91 lines
2.5 KiB
Diff
From 7ad6fef8fe110093939c422b5c3b381ebe47e4e9 Mon Sep 17 00:00:00 2001
|
|
From: Steffen Maier <maier@linux.ibm.com>
|
|
Date: Fri, 26 May 2023 19:51:09 +0200
|
|
Subject: [PATCH 15/23] feat(qeth_rules): remove qeth handling consolidated in
|
|
95znet
|
|
|
|
Dracut module 95znet handles a superset of qeth_rules as of the preceding
|
|
commit ("feat(znet): use zdev for consolidated device configuration").
|
|
|
|
The instmods list in installkernel() seemed to have been incomplete because
|
|
qeth needs one or both of qeth_l2 and qeth_l3 but qeth intentionally does
|
|
not depend on them so depmod cannot resolve that.
|
|
|
|
In contrast to the old dracut module 95znet, 95qeth_rules also did not seem
|
|
to have parsing for the upstream dracut cmdline options "rd.znet=" and
|
|
"rd.znet_ifname=".
|
|
|
|
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
|
|
---
|
|
modules.d/95qeth_rules/module-setup.sh | 58 --------------------------
|
|
1 file changed, 58 deletions(-)
|
|
delete mode 100755 modules.d/95qeth_rules/module-setup.sh
|
|
|
|
diff --git a/modules.d/95qeth_rules/module-setup.sh b/modules.d/95qeth_rules/module-setup.sh
|
|
deleted file mode 100755
|
|
index a84ac151..00000000
|
|
--- a/modules.d/95qeth_rules/module-setup.sh
|
|
+++ /dev/null
|
|
@@ -1,58 +0,0 @@
|
|
-#!/bin/bash
|
|
-
|
|
-# called by dracut
|
|
-check() {
|
|
- local _arch=${DRACUT_ARCH:-$(uname -m)}
|
|
- local _online=0
|
|
- [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
|
|
- dracut_module_included network || return 1
|
|
-
|
|
- [[ $hostonly ]] && {
|
|
- for i in /sys/devices/qeth/*/online; do
|
|
- [ ! -f "$i" ] && continue
|
|
- read -r _online < "$i"
|
|
- [ "$_online" -eq 1 ] && return 0
|
|
- done
|
|
- }
|
|
- return 255
|
|
-}
|
|
-
|
|
-# called by dracut
|
|
-installkernel() {
|
|
- instmods qeth
|
|
-}
|
|
-
|
|
-# called by dracut
|
|
-install() {
|
|
- ccwid() {
|
|
- qeth_path=$(readlink -e -q "$1"/device)
|
|
- basename "$qeth_path"
|
|
- }
|
|
-
|
|
- inst_rules_qeth() {
|
|
- for rule in /etc/udev/rules.d/{4,5}1-qeth-${1}.rules; do
|
|
- # prefer chzdev generated 41- rules
|
|
- if [ -f "$rule" ]; then
|
|
- inst_rules "$rule"
|
|
- break
|
|
- fi
|
|
- done
|
|
- }
|
|
-
|
|
- has_carrier() {
|
|
- carrier=0
|
|
- # not readable in qeth interfaces
|
|
- # that have just been assembled, ignore
|
|
- # read error and assume no carrier
|
|
- read -r carrier 2> /dev/null < "$1/carrier"
|
|
- [ "$carrier" -eq 1 ] && return 0
|
|
- return 1
|
|
- }
|
|
-
|
|
- for dev in /sys/class/net/*; do
|
|
- has_carrier "$dev" || continue
|
|
- id=$(ccwid "$dev")
|
|
- [ -n "$id" ] && inst_rules_qeth "$id"
|
|
- done
|
|
-
|
|
-}
|
|
--
|
|
2.42.0
|
|
|