From b4b2202ff5da88499c46ddcee56d02d7cecaebca Mon Sep 17 00:00:00 2001 From: Steffen Maier Date: Tue, 8 Mar 2022 20:44:42 +0100 Subject: [PATCH] dbginfo.sh: collect all places where modprobe.d config files could exist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This can now include /lib/modprobe.d/10-unsupported-modules.conf Strictly speaking, modprobe would only consider *.conf files inside those directories, but for consistency with the already existing collection of /etc/modprobe.d instead of /etc/modprobe.d/*.conf, do the same for the added missing locations. 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 f6897d60..36c18d2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ Release history for s390-tools (MIT version) - dbginfo.sh: Collect config files of systemd-modules-load.service Bug Fixes: + - dbginfo.sh: Collect all places where modprobe.d config files could exist * __v2.20.0 (2022-02-04)__ diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh index 8b1e6c09..397b67d0 100755 --- a/scripts/dbginfo.sh +++ b/scripts/dbginfo.sh @@ -403,11 +403,15 @@ CONFIGFILES="\ /etc/systemd\ /etc/udev*\ /etc/xinet.d\ + /lib/modprobe.d\ $(find /lib/modules -name modules.dep 2>/dev/null)\ /lib/systemd/system/docker.service\ + /usr/lib/modprobe.d\ /usr/lib/modules-load.d/*.conf\ /usr/lib/systemd/system\ + /usr/local/lib/modprobe.d\ /usr/local/lib/modules-load.d/*.conf\ + /run/modprobe.d\ /run/modules-load.d/*.conf\ /run/udev/chreiplzfcpmp-ipl-volume-id\ /run/udev/rules.d\