Revert "pettersson has bpo acpid"

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

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 2e8773b97e7a2bbba901a15674a329631bdd3655..997bf141f55e26c3bd70da64d53c6901ca2e3b24 100644 (file)
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -5,14 +5,7 @@ Facter.add("smartarraycontroller") do
        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"
@@ -25,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