aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornavid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-10-05 09:53:18 +0000
committernavid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-10-05 09:53:18 +0000
commit8e1596469a45db9516fd6cb44e5ae286be560a05 (patch)
treed1327cbe85f789dac0fc41264be8e9c536540873 /src
parent92bf7d380893d3e376a5e358f3d7fe03fec80aae (diff)
downloadsos-8e1596469a45db9516fd6cb44e5ae286be560a05.tar.gz
filesys: one fdisk -l for all
selinux: collect fixfilex check output git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@414 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src')
-rw-r--r--src/lib/sos/plugins/filesys.py6
-rw-r--r--src/lib/sos/plugins/selinux.py6
2 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/sos/plugins/filesys.py b/src/lib/sos/plugins/filesys.py
index 46a3506d..93645314 100644
--- a/src/lib/sos/plugins/filesys.py
+++ b/src/lib/sos/plugins/filesys.py
@@ -13,7 +13,6 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
import sos.plugintools
-from sos.helpers import sosReadFile
import os
class filesys(sos.plugintools.PluginBase):
@@ -32,10 +31,7 @@ class filesys(sos.plugintools.PluginBase):
self.collectExtOutput("/bin/df -al", root_symlink = "df")
self.collectExtOutput("/sbin/blkid")
- for disk in os.listdir("/sys/block"):
- if disk in [ ".", ".." ] or disk.startswith("ram") or sosReadFile("/sys/block/%s/removable" % disk ).strip() == "1":
- continue
- self.collectExtOutput("/sbin/fdisk -l /dev/%s" % (disk))
+ self.collectExtOutput("/sbin/fdisk -l", root_symlink = "fdisk-l")
for extfs in self.doRegexFindAll(r"^(/dev/.+) on .+ type ext.\s+", mounts):
self.collectExtOutput("/sbin/tune2fs -l %s" % (extfs))
diff --git a/src/lib/sos/plugins/selinux.py b/src/lib/sos/plugins/selinux.py
index dc82e608..33f1a3a9 100644
--- a/src/lib/sos/plugins/selinux.py
+++ b/src/lib/sos/plugins/selinux.py
@@ -19,11 +19,11 @@ class selinux(sos.plugintools.PluginBase):
"""selinux related information
"""
def setup(self):
- self.addCopySpec("/etc/selinux/*")
+ self.addCopySpec("/etc/selinux")
self.collectExtOutput("/usr/bin/selinuxconfig")
self.collectExtOutput("/usr/sbin/sestatus", root_symlink = "sestatus")
- self.collectExtOutput("/bin/rpm -q -V selinux-policy-targeted")
- self.collectExtOutput("/bin/rpm -q -V selinux-policy-strict")
+ self.eta_weight += 120 # this plugins takes 120x longer (for ETA)
+ self.collectExtOutput("/sbin/fixfiles check")
return
def checkenabled(self):