some more ferm fixups

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

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 8a09a71ca76c464d12db88d1cb5d9d982e2d27cd..997bf141f55e26c3bd70da64d53c6901ca2e3b24 100644 (file)
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -1,26 +1,11 @@
 Facter.add("smartarraycontroller") do
        confine :kernel => :linux
-       ENV["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin"
        setcode do
-               ishp = "false"
-               lspciexists = system "/bin/bash -c 'which lspci >&/dev//null'"
-               if $?.exitstatus == 0
-                       %x{lspci 2>&1}.each { |s|
-                               ishp = "true" if s =~ /RAID bus controller: (.*) Smart Array/
-                       }
-               end
-               ishp == "true"
+               FileTest.exist?("/dev/cciss/")
        end
 end
 
-Facter.add("mptcontroller") do
-       confine :kernel => :linux
-       setcode do
-               FileTest.exist?("/proc/mpt/summary")
-       end
-end
-
-Facter.add("3warecontroller") do
+Facter.add("ThreeWarecontroller") do
        confine :kernel => :linux
        setcode do
                is3w = "false"
@@ -33,6 +18,26 @@ Facter.add("3warecontroller") do
        end
 end
 
+Facter.add("megaraid") do
+       confine :kernel => :linux
+       setcode do
+               FileTest.exist?("/dev/megadev0")
+       end
+end
+
+Facter.add("mptraid") do
+       setcode do
+               FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt0") or FileTest.exist?("/proc/mpt/summary")
+       end
+end
+
+Facter.add("aacraid") do
+       confine :kernel => :linux
+       setcode do
+               FileTest.exist?("/dev/aac0")
+       end
+end
+
 Facter.add("swraid") do
        confine :kernel => :linux
        setcode do