diff options
| author | navid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-11-22 11:04:06 +0000 |
|---|---|---|
| committer | navid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-11-22 11:04:06 +0000 |
| commit | 3cab8f88cc76778202603327455059d3f5d3a4ad (patch) | |
| tree | 3034076961767d8793a961358aa1e611cbdf9e3b | |
| parent | e2ea89dbbe1b1731ba4eda7fbe40ea315594a1c9 (diff) | |
| download | sos-3cab8f88cc76778202603327455059d3f5d3a4ad.tar.gz | |
selinux: always collect sestatus, even if disabled
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@458 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | src/lib/sos/plugins/selinux.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |