From a26f61c4fe87aee5ff1c4513b1ce48f6567f37f0 Mon Sep 17 00:00:00 2001 From: Steffen Maier Date: Tue, 8 Mar 2022 20:38:16 +0100 Subject: [PATCH] dbginfo.sh: collect config files of systemd-modules-load.service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recent multipath-tools can depend on this. https://github.com/opensvc/multipath-tools/commit/a1eabea75e8e0f6072f2b655cae25ec473b006c5 ("multipathd.service: drop ExecStartPre for loading dm-multipath") https://github.com/opensvc/multipath-tools/commit/92f0893ac1f0c9daf7eef8753e6bd9730bcce4c6 ("multipath-tools: install modules-load.d/multipath.conf") This can now also include /usr/lib/modules-load.d/s390-pkey.conf Complements v2.8.0 commit dffd41943e5c ("pkey: Support autoloading kernel pkey module"). Signed-off-by: Steffen Maier Signed-off-by: Jan Höppner --- CHANGELOG.md | 1 + scripts/dbginfo.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d9d0aea..f6897d60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ Release history for s390-tools (MIT version) build environments without access to `pandoc` - dbginfo.sh: Add multipath info to map paths to FC addressing and prio group - dbginfo.sh: Sort list of environment variables for readability + - dbginfo.sh: Collect config files of systemd-modules-load.service Bug Fixes: diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh index 136b16f1..8b1e6c09 100755 --- a/scripts/dbginfo.sh +++ b/scripts/dbginfo.sh @@ -382,6 +382,7 @@ CONFIGFILES="\ /etc/lvm\ /etc/modprobe.conf*\ /etc/modprobe.d\ + /etc/modules-load.d/*.conf\ /etc/mtab\ /etc/multipath\ /etc/network\ @@ -404,7 +405,10 @@ CONFIGFILES="\ /etc/xinet.d\ $(find /lib/modules -name modules.dep 2>/dev/null)\ /lib/systemd/system/docker.service\ + /usr/lib/modules-load.d/*.conf\ /usr/lib/systemd/system\ + /usr/local/lib/modules-load.d/*.conf\ + /run/modules-load.d/*.conf\ /run/udev/chreiplzfcpmp-ipl-volume-id\ /run/udev/rules.d\ "