s/latest/installed/

[dsa-puppet.git] / facts / raidcontroller.rb

diff --git a/facts/raidcontroller.rb b/facts/raidcontroller.rb
index d4bdd07ae9e91aac88f9bc44cee2fa03bb5b4e53..12d140fd078ae57347a77146c0befcf0fc0fa9ff 100644 (file)
--- a/facts/raidcontroller.rb
+++ b/facts/raidcontroller.rb
@@ -1,4 +1,4 @@
-Facter.add("raidcontroller") do
+Facter.add("smartarraycontroller") do
        confine :kernel => :linux
        ENV["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin"
        setcode do
@@ -9,7 +9,7 @@ Facter.add("raidcontroller") do
                                ishp = "true" if s =~ /RAID bus controller: (.*) Smart Array/
                        }
                end
-               ishp
+               ishp == "true"
        end
 end
 
@@ -29,6 +29,20 @@ Facter.add("3warecontroller") do
                                is3w = "true" if x =~ /Vendor: 3ware/
                        }
                end
-               is3w
+               is3w == "true"
        end
 end
+
+Facter.add("swraid") do
+       confine :kernel => :linux
+       setcode do
+                swraid = "false"
+               if FileTest.exist?("/proc/mdstat") && FileTest.exist?("/sbin/mdadm")
+                        IO.foreach("/proc/mdstat") { |x|
+                                swraid = "true" if x =~ /md[0-9]+ : active/
+                        }
+                end
+                swraid == "true"
+       end
+end
+