Fixed #5485 - Updated selinux_mode fact

1.  Added tested
2.  Refactored to use F:U:R.exec
3.  Chomp trailing newline

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/facter/selinux.rb b/lib/facter/selinux.rb
index 0e9637d..ee663a0 100644
--- a/lib/facter/selinux.rb
+++ b/lib/facter/selinux.rb
@@ -4,7 +4,7 @@
 Facter.add("selinux") do
     confine :kernel => :linux
 
-    setcode do 
+    setcode do
         result = "false"
         if FileTest.exists?("/selinux/enforce")
             if FileTest.exists?("/proc/self/attr/current")
@@ -31,7 +31,7 @@ end
 
 Facter.add("selinux_policyversion") do
     confine :selinux => :true
-    setcode do 
+    setcode do
         File.read("/selinux/policyvers")
     end
 end
@@ -39,7 +39,10 @@ end
 Facter.add("selinux_mode") do
     confine :selinux => :true
     setcode do
-        %x{/usr/sbin/sestatus | /bin/grep "Policy from config file:" | awk '{print $5}'}        
+        mode = Facter::Util::Resolution.exec('/usr/sbin/sestatus')
+        mode.each_line do |l|
+          mode = $1 if l =~ /^Current Mode:\s+(\w+)$/
+        end
+        mode.chomp
     end
 end
-