X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fraidarray.rb;h=997bf141f55e26c3bd70da64d53c6901ca2e3b24;hb=5872b6aadfceee88690e528910131ec585d8388b;hp=2bc3f0ed19f61e57ae22d9c4edf5fb0ff47f4a9d;hpb=306305c3edb2e6e7fce4764c927982da905454ca;p=mirror%2Fdsa-puppet.git

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 2bc3f0ed1..997bf141f 100644
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -5,13 +5,6 @@ Facter.add("smartarraycontroller") do
 	end
 end
 
-Facter.add("mptcontroller") do
-	confine :kernel => :linux
-	setcode do
-		FileTest.exist?("/proc/mpt/summary")
-	end
-end
-
 Facter.add("ThreeWarecontroller") do
 	confine :kernel => :linux
 	setcode do
@@ -25,6 +18,26 @@ Facter.add("ThreeWarecontroller") 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