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

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 78972a198..acd46b845 100644
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -1,15 +1,7 @@
 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 (lspciexists && (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
 
@@ -20,7 +12,7 @@ Facter.add("mptcontroller") do
 	end
 end
 
-Facter.add("3warecontroller") do
+Facter.add("ThreeWarecontroller") do
 	confine :kernel => :linux
 	setcode do
 		is3w = "false"
@@ -33,6 +25,13 @@ Facter.add("3warecontroller") do
 	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