diff options
author | Bryn M. Reeves <bmr@redhat.com> | 2012-12-10 13:54:23 +0000 |
---|---|---|
committer | Bryn M. Reeves <bmr@redhat.com> | 2012-12-10 13:54:23 +0000 |
commit | 7a0cf069b5d87c9362d89d16217710408cce7e0c (patch) | |
tree | 2ef4eeb0d2b870dfac536d8eae3d54f285f8ba85 | |
parent | c0b60a5fe379da7099319dee4ebf773d71ced677 (diff) | |
download | sos-7a0cf069b5d87c9362d89d16217710408cce7e0c.tar.gz |
Move sysctl collection to kernel module and add new locations
The sysctl configuration and state belongs to the kernel. Reflect
this by moving the collection of sysctl.conf to the kernel module
(where sysctl -a is already captured) and add collection of the
/etc/sysctl.d and /lib/sysctl.d directories.
-rw-r--r-- | sos/plugins/kernel.py | 3 | ||||
-rw-r--r-- | sos/plugins/system.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py index bbbe511c..525ecba7 100644 --- a/sos/plugins/kernel.py +++ b/sos/plugins/kernel.py @@ -67,6 +67,9 @@ class kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/modules.conf", "/etc/modprobe.conf", "/etc/modprobe.d", + "/etc/sysctl.conf", + "/etc/sysctl.d", + "/lib/sysctl.d", "/proc/cmdline", "/proc/driver", "/proc/zoneinfo", diff --git a/sos/plugins/system.py b/sos/plugins/system.py index af31220e..455e179c 100644 --- a/sos/plugins/system.py +++ b/sos/plugins/system.py @@ -20,7 +20,6 @@ class system(Plugin, RedHatPlugin): def setup(self): self.addCopySpecs([ "/proc/sys", - "/etc/sysctl.conf", "/etc/cron*", "/etc/anacrontab", "/var/spool/cron*", |