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

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index d7bf8a9e8..997bf141f 100644
--- 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) && (FileTest.exist?("/proc/bus/pci")))
-			%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