[plugins] Removed everything copying from /etc/sysconfig

general.py already copies the whole /etc/sysconfig


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1070 ef72aa8b-4018-0410-8976-d6e080ef94d8

17 files changed, 3 insertions, 168 deletions

diff --git a/sos/plugins/amd.py b/sos/plugins/amd.py
index 8bfcfcc8..1cdd067d 100644
--- a/sos/plugins/amd.py
+++ b/sos/plugins/amd.py
@@ -25,10 +25,7 @@ class amd(sos.plugintools.PluginBase):
         return self.isInstalled("am-utils") or exists("/etc/rc.d/init.d/amd")
 
     def setup(self):
-        self.addCopySpecs([
-            "/etc/amd.*",
-            "/etc/rc.d/init.d/amd",
-            "/etc/sysconfig/amd"])
+        self.addCopySpecs("/etc/amd.*")
         self.collectExtOutput("/bin/rpm -qV am-utils")
         self.collectExtOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts")
         self.collectExtOutput("/bin/mount | egrep -e 'automount|pid.*nfs'")
diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py
index aa7d4d1f..e69de29b 100644
--- a/sos/plugins/anaconda.py
+++ b/sos/plugins/anaconda.py
@@ -1,31 +0,0 @@
-### This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import sos.plugintools
-from os.path import exists
-
-class anaconda(sos.plugintools.PluginBase):
-    """Anaconda / Installation information
-    """
-    def checkenabled(self):
-        return exists("/var/log/anaconda.log")
-
-    def setup(self):
-        self.addCopySpecs([
-            "/root/anaconda-ks.cfg",
-            "/root/install.log",
-            "/root/install.log.syslog",
-            "/var/log/anaconda.log",
-            "/var/log/anaconda.syslog",
-            "/var/log/anaconda.xlog"])
diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py
index c76bf5f8..ba31327b 100644
--- a/sos/plugins/auditd.py
+++ b/sos/plugins/auditd.py
@@ -20,6 +20,4 @@ class auditd(sos.plugintools.PluginBase):
 
     optionList = [("syslogsize", "max size (MiB) to collect per syslog file", "", 15)]
 
-    def setup(self):
-        self.addCopySpecs(["/etc/audit/auditd.conf", "/etc/audit/audit.rules"])
         self.addCopySpecLimit("/var/log/audit*", sizelimit = self.getOption("syslogsize"))
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index 9d486a1a..fbc3c5b9 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -44,11 +44,6 @@ class autofs(sos.plugintools.PluginBase):
             return i[1]
     
     def setup(self):
-        self.addCopySpecs([
-            "/etc/auto*",
-            "/etc/sysconfig/autofs",
-            "/etc/init.d/autofs"])
-        self.collectExtOutput("/bin/rpm -qV autofs")
         self.collectExtOutput("/etc/init.d/autofs status")
         self.collectExtOutput("ps auxwww | grep automount")
         self.collectExtOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts")
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 16ef2b86..7697275e 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -46,8 +46,6 @@ class cluster(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/cluster.conf")
         self.addCopySpec("/etc/cluster.xml")
         self.addCopySpec("/etc/cluster")
-        self.addCopySpec("/etc/sysconfig/cluster")
-        self.addCopySpec("/etc/sysconfig/cman")
         self.addCopySpec("/var/lib/ricci")
         self.addCopySpec("/var/lib/luci")
         self.addCopySpec("/var/log/cluster")
diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py
index 8a109471..3c776d8f 100644
--- a/sos/plugins/dhcp.py
+++ b/sos/plugins/dhcp.py
@@ -23,7 +23,4 @@ class dhcp(sos.plugintools.PluginBase):
         return sos.plugintools.PluginBase.checkenabled(self)
         
     def setup(self):
-        self.addCopySpecs([
-            "/etc/sysconfig/dhcrelay",
-            "/etc/sysconfig/dhcpd",
-            "/etc/dhcpd.conf"])
+        self.addCopySpec("/etc/dhcpd.conf")
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index baefaa32..d9987380 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -24,23 +24,6 @@ class filesys(sos.plugintools.PluginBase):
     optionList = [("dumpe2fs", 'dump filesystem information', 'slow', False)]
 
     def setup(self):
-        self.addCopySpecs([
-            "/proc/filesystems",
-            "/etc/fstab",
-            "/proc/self/mounts",
-            "/proc/mounts",
-            "/proc/mdstat",
-            "/etc/raidtab",
-            "/etc/mdadm.conf"])
-        mounts = self.collectOutputNow("/bin/mount -l", root_symlink = "mount")
-        
-        self.collectExtOutput("/bin/findmnt")
-        self.collectExtOutput("/bin/df -al", root_symlink = "df")
-        self.collectExtOutput("/bin/df -ali")
-        if self.getOption('lsof'):
-            self.collectExtOutput("/usr/sbin/lsof -b +M -n -l -P", root_symlink = "lsof")
-        self.collectExtOutput("/sbin/blkid -c /dev/null")
-        
         part_titlep = re.compile("^major")
         blankp = re.compile("^$")
         partlist = []
diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py
index 91b59d40..8d4a26f7 100644
--- a/sos/plugins/i18n.py
+++ b/sos/plugins/i18n.py
@@ -19,7 +19,5 @@ class i18n(sos.plugintools.PluginBase):
     """i18n related information
     """
     def setup(self):
-        self.addCopySpecs([
-            "/etc/sysconfig/i18n",
-            "/etc/X11/xinit/xinput.d/*"])
+        self.addCopySpec("/etc/X11/xinit/xinput.d/*")
 	self.collectExtOutput("/usr/bin/locale")
diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index 7a027c7a..bea5d0b9 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -24,6 +24,5 @@ class kdump(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpecs([
             "/etc/kdump.conf",
-            "/etc/sysconfig/kdump",
             "/proc/cmdline",
             "/etc/udev/rules.d/*kexec.rules"])
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
index 59b6bb28..6afd7c8f 100644
--- a/sos/plugins/mysql.py
+++ b/sos/plugins/mysql.py
@@ -27,6 +27,5 @@ class mysql(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpecs([
             "/etc/my.cnf",
-            "/etc/sysconfig/network",
             "/etc/ld.so.conf.d/mysql*",
             "/var/log/mysql*"])
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index 6710a165..12145446 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -40,4 +40,3 @@ class named(sos.plugintools.PluginBase):
                 self.addCopySpec(self.getDnsDir(cfg))
                 self.addForbiddenPath(join(self.getDnsDir(cfg),"chroot/dev"))
                 self.addForbiddenPath(join(self.getDnsDir(cfg),"chroot/proc"))
-        self.addCopySpec("/etc/sysconfig/named")
diff --git a/sos/plugins/netdump.py b/sos/plugins/netdump.py
deleted file mode 100644
index 1dcbc0f0..00000000
--- a/sos/plugins/netdump.py
+++ /dev/null
@@ -1,25 +0,0 @@
-### This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import sos.plugintools
-from os.path import exists
-
-class netdump(sos.plugintools.PluginBase):
-    """Netdump Configuration Information
-    """
-    def checkenabled(self):
-        return self.isInstalled("netdump") or exists("/etc/sysconfig/netdump*")
-
-    def setup(self):
-        self.addCopySpec("/etc/sysconfig/netdump")
diff --git a/sos/plugins/process.py b/sos/plugins/process.py
index ea19be55..70875c8e 100644
--- a/sos/plugins/process.py
+++ b/sos/plugins/process.py
@@ -17,19 +17,6 @@ import time
 import os
 
 class process(sos.plugintools.PluginBase):
-    """process information
-    """
-    def setup(self):
-        self.collectExtOutput("/bin/ps auxwww", root_symlink = "ps")
-        self.collectExtOutput("/bin/ps auxwwwm")
-        self.collectExtOutput("/bin/ps alxwww")
-        self.collectExtOutput("/usr/bin/pstree", root_symlink = "pstree")
-        self.collectExtOutput("/usr/sbin/lsof -b +M -n -l", root_symlink = "lsof")
-
-    def find_mountpoint(s):
-        if (os.path.ismount(s) or len(s)==0): return s
-        else: return mountpoint(os.path.split(s)[0])
-
     def diagnose(self):
         from subprocess import Popen, PIPE
         # check that no process is in state D
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py
index 0c409aec..e6d76fc1 100644
--- a/sos/plugins/rhn.py
+++ b/sos/plugins/rhn.py
@@ -39,7 +39,6 @@ class rhn(sos.plugintools.PluginBase):
         self.addCopySpecs([
             "/etc/httpd/conf*",
             "/etc/rhn",
-            "/etc/sysconfig/rhn"
             "/var/log/rhn*"])
 
         if self.getOption("log"):
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index 33529cee..e69de29b 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -1,30 +0,0 @@
-### This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import sos.plugintools
-
-class rpm(sos.plugintools.PluginBase):
-    """RPM information
-    """
-    optionList = [("rpmq", "queries for package information via rpm -q", "fast", True),
-                  ("rpmva", "runs a verify on all packages", "slow", False)]
-                  
-    def setup(self):
-        self.addCopySpec("/var/log/rpmpkgs")
-
-        if self.getOption("rpmq"):
-            self.collectExtOutput("/bin/rpm -qa --qf=\"%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}~~%{INSTALLTIME:date}\t%{INSTALLTIME}\t%{VENDOR}\n\" --nosignature --nodigest|/bin/awk -F ~~ '{printf \"%-60s%s\\n\",$1,$2}'|sort", root_symlink = "installed-rpms")
-
-        if self.getOption("rpmva"):
-            self.collectExtOutput("/bin/rpm -Va", root_symlink = "rpm-Va", timeout = 3600)
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index 31739e6a..50ab0497 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -48,7 +48,6 @@ class s390(sos.plugintools.PluginBase):
             "/sys/bus/ccw/drivers/zfcp/0.*/0x*/0x*/*",
             "/etc/zipl.conf",
             "/etc/zfcp.conf",
-            "/etc/sysconfig/dumpconf",
             "/etc/src_vipa.conf",
             "/etc/ccwgroup.conf",
             "/etc/chandev.conf"])
diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py
index 0b73451b..e69de29b 100644
--- a/sos/plugins/sendmail.py
+++ b/sos/plugins/sendmail.py
@@ -1,27 +0,0 @@
-## Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@redhat.com>
-
-### This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import sos.plugintools
-from os.path import exists
-
-class sendmail(sos.plugintools.PluginBase):
-    """sendmail information
-    """
-    def checkenabled(self):
-        return self.isInstalled("sendmail") or exists("/etc/rc.d/init.d/sendmail")
-
-    def setup(self):
-        self.addCopySpecs(["/etc/mail/*", "/var/log/maillog"])