X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fraidarray.rb;h=997bf141f55e26c3bd70da64d53c6901ca2e3b24;hb=e7c91b08cf909f011795f3d79f15e22b1e975d6c;hp=35a4126f812fb46b3c1235a0e946a7f0657dd67d;hpb=95c105b7069860082dca5b7b5b3a987e1730a6b5;p=mirror%2Fdsa-puppet.git

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 35a4126f8..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
@@ -34,7 +27,7 @@ end
 
 Facter.add("mptraid") do
 	setcode do
-		FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt9")
+		FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt0") or FileTest.exist?("/proc/mpt/summary")
 	end
 end