X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=facts%2Fraidcontroller.rb;h=f2834c2dcf3a72abc81f4ee7f94523a9b8a8dfb5;hb=49e6bfe2dcf619c24dd1c9fe02b336aa8c10efb1;hp=275c5fac3b97aaaf2827aa50a3d49df1cd56106d;hpb=ba6f9245a5e6dc40ceec360a6088c411586d2e72;p=mirror%2Fdsa-puppet.git

diff --git a/facts/raidcontroller.rb b/facts/raidcontroller.rb
index 275c5fac3..f2834c2dc 100644
--- a/facts/raidcontroller.rb
+++ b/facts/raidcontroller.rb
@@ -1,14 +1,34 @@
-Facter.add("raidcontroller") 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
-                        %x{lspci}.each { |s|
-                                ishp = "true" if s =~ /RAID bus controller: (.*) Smart Array/
-                        }
-                end
-                ishp
-        end
+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
+			%x{lspci}.each { |s|
+				ishp = "true" if s =~ /RAID bus controller: (.*) Smart Array/
+			}
+		end
+		ishp
+	end
+end
+
+Facter.add("mptcontroller") do
+	confine :kernel => :linux
+	setcode do
+		FileTest.exist?("/proc/mpt/summary")
+	end
+end
+
+Facter.add("3warecontroller") do
+	confine :kernel => :linux
+	setcode do
+		is3w = "false"
+		if FileTest.exist?("/proc/scsi/scsi")
+			IO.foreach("/proc/scsi/scsi") { |x|
+				is3w = "true" if x =~ /Vendor: 3ware/
+			}
+		end
+		is3w
+	end
 end