aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauricio Faria de Oliveira <mfo@canonical.com>2022-08-11 16:31:51 -0300
committerBryanQuigley <code@bryanquigley.com>2022-08-18 12:46:29 -0700
commit77b224d2ef8f03d2fa2abebf1f125baf0cf011d6 (patch)
tree4022a1534822c080c656e1c8a6a54d8744e09ad2
parent6468eed722a7ec9ee5947b2d92ea1a887134a2d8 (diff)
downloadsos-77b224d2ef8f03d2fa2abebf1f125baf0cf011d6.tar.gz
[kernel] copy modprobe.d/*.conf from other possible locations
There might be module configuration files (modprobe.d/*.conf) not only in /etc, but also in /lib, /run, and /usr/local/lib, per modprobe.d(5) [1]. Let's copy those too. P.S.: /lib is correct for distros with distinct /usr/lib too (checked on Ubuntu 14.04/16.04/18.04 and 20.04/22.04). [1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/tree/man/ modprobe.d.xml?h=v30#n42 Test steps: $ for dir in /etc /lib /run /usr/local/lib do dir=$dir/modprobe.d sudo mkdir -p $dir sudo touch $dir/test.conf done $ sudo ./bin/sos report -o kernel --batch --quiet $ sudo tar tf /tmp/sosreport-*.tar.xz \ | grep -o '/.*/modprobe.d/test.conf' $ sudo rm -f /tmp/sosreport-* $ for dir in /etc /lib /run /usr/local/lib do sudo rm -f $dir/modprobe.d/test.conf done Before: $ sudo tar tf /tmp/sosreport-*.tar.xz \ | grep -o '/.*/modprobe.d/test.conf' /etc/modprobe.d/test.conf After: $ sudo tar tf /tmp/sosreport-*.tar.xz \ | grep -o '/.*/modprobe.d/test.conf' /etc/modprobe.d/test.conf /run/modprobe.d/test.conf /usr/lib/modprobe.d/test.conf /usr/local/lib/modprobe.d/test.conf Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
-rw-r--r--sos/report/plugins/kernel.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/sos/report/plugins/kernel.py b/sos/report/plugins/kernel.py
index 0578d0d2..71475e49 100644
--- a/sos/report/plugins/kernel.py
+++ b/sos/report/plugins/kernel.py
@@ -111,6 +111,9 @@ class Kernel(Plugin, IndependentPlugin):
"/etc/modules.conf",
"/etc/modprobe.conf",
"/etc/modprobe.d",
+ "/lib/modprobe.d",
+ "/run/modprobe.d",
+ "/usr/local/lib/modprobe.d",
"/etc/sysctl.conf",
"/etc/sysctl.d",
"/lib/sysctl.d",