From 3cab8f88cc76778202603327455059d3f5d3a4ad Mon Sep 17 00:00:00 2001 From: navid Date: Thu, 22 Nov 2007 11:04:06 +0000 Subject: selinux: always collect sestatus, even if disabled git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@458 ef72aa8b-4018-0410-8976-d6e080ef94d8 --- src/lib/sos/plugins/selinux.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/sos/plugins/selinux.py b/src/lib/sos/plugins/selinux.py index 33f1a3a9..e692297b 100644 --- a/src/lib/sos/plugins/selinux.py +++ b/src/lib/sos/plugins/selinux.py @@ -19,9 +19,9 @@ class selinux(sos.plugintools.PluginBase): """selinux related information """ def setup(self): + # sestatus is always collected in checkenabled() self.addCopySpec("/etc/selinux") self.collectExtOutput("/usr/bin/selinuxconfig") - self.collectExtOutput("/usr/sbin/sestatus", root_symlink = "sestatus") self.eta_weight += 120 # this plugins takes 120x longer (for ETA) self.collectExtOutput("/sbin/fixfiles check") return @@ -29,7 +29,7 @@ class selinux(sos.plugintools.PluginBase): def checkenabled(self): # is selinux enabled ? try: - if commands.getoutput("/usr/sbin/sestatus").split(":")[1].strip() == "disabled": + if self.collectOutputNow("/usr/sbin/sestatus", root_symlink = "sestatus").split(":")[1].strip() == "disabled": return False except: pass -- cgit