X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fraidarray.rb;h=997bf141f55e26c3bd70da64d53c6901ca2e3b24;hb=deac1e253c96dc246790cce50cbeb918b346da42;hp=acd46b84559708fcbf5e2a22ce41344a5fe88510;hpb=6ed568b6908f085d89f776d55e717ef100bda2d2;p=mirror%2Fdsa-puppet.git

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index acd46b845..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,19 @@ 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