From 7a0cf069b5d87c9362d89d16217710408cce7e0c Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Mon, 10 Dec 2012 13:54:23 +0000
Subject: 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.
---
 sos/plugins/kernel.py | 3 +++
 sos/plugins/system.py | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

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*",
-- 
cgit