X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fraidcontroller.rb;h=12d140fd078ae57347a77146c0befcf0fc0fa9ff;hb=6c0e762ea3621bcb1b3ac4173b06b3e0bb5b6a11;hp=1d6b631d1b87a1d04064445c45192a706d025eaf;hpb=25de7df83fd1f5f38806e08b903670fd4d2536c7;p=mirror%2Fdsa-puppet.git

diff --git a/facts/raidcontroller.rb b/facts/raidcontroller.rb
index 1d6b631d1..12d140fd0 100644
--- a/facts/raidcontroller.rb
+++ b/facts/raidcontroller.rb
@@ -1,14 +1,48 @@
-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/
+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 == "true"
+	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 == "true"
+	end
+end
+
+Facter.add("swraid") do
+	confine :kernel => :linux
+	setcode do
+                swraid = "false"
+		if FileTest.exist?("/proc/mdstat") && FileTest.exist?("/sbin/mdadm")
+                        IO.foreach("/proc/mdstat") { |x|
+                                swraid = "true" if x =~ /md[0-9]+ : active/
                         }
                 end
-                ishp
-        end
+                swraid == "true"
+	end
 end
+