aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Quigley <bryan.quigley@canonical.com>2017-07-19 16:56:07 -0400
committerBryn M. Reeves <bmr@redhat.com>2018-03-28 16:32:55 +0100
commit320a4140810e3e654371595631fd923459b0b2f2 (patch)
tree03c554551abf62bb66bd0715d375343bae880e3b
parentc93e2f96e29744edb25a4aa1943798eb517b6bef (diff)
downloadsos-320a4140810e3e654371595631fd923459b0b2f2.tar.gz
[kernel] Use modinfo_ALL_MODULES as filename
We've found the modinfo autogenerated name ends up being too long for some filesystems (specifically ecryptfs). This just changes the name to modinfo. It used to be something like: modinfo_cpuidle_pcie_aspm_ccp_kernel_pstore_edac_core_pci_hotplug_ rcupdate_mousedev_vt_x_tables_processor_lp_r8169_8250_snd_hda_ intel_xen_netfront_crypto_simd_efivars_i2c_piix4_sysimgblt _pciehp_macvlan_i2c_designware_core_gpio_generic_uvcvideo_usbhid_ther Added /sys/module/*/version which in my testing let us capture at least something for every module that is available in /sys/module. Closes: #1064 Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/kernel.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index 7d534e27..2cab906b 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -35,7 +35,8 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
try:
modules = os.listdir(self.sys_module)
- self.add_cmd_output("modinfo " + " ".join(modules))
+ self.add_cmd_output("modinfo " + " ".join(modules),
+ suggest_filename="modinfo_ALL_MODULES")
except OSError:
self._log_warn("could not list %s" % self.sys_module)
@@ -64,6 +65,7 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
"/sys/module/*/initstate",
"/sys/module/*/refcnt",
"/sys/module/*/taint",
+ "/sys/module/*/version",
"/sys/firmware/acpi/*",
"/proc/kallsyms",
"/proc/buddyinfo",