X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fraidarray.rb;h=d0d13092924a742631ff1a77c400a859be8aeed4;hb=500dd5ecaab513bf474d817785da991c6ee53fff;hp=997bf141f55e26c3bd70da64d53c6901ca2e3b24;hpb=e06b59cd9caf42918d3d1255b2ab3f7e209be0f9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/raidarray.rb b/modules/debian-org/lib/facter/raidarray.rb
index 997bf141f..d0d130929 100644
--- a/modules/debian-org/lib/facter/raidarray.rb
+++ b/modules/debian-org/lib/facter/raidarray.rb
@@ -1,53 +1,70 @@
 Facter.add("smartarraycontroller") do
 	confine :kernel => :linux
 	setcode do
-		FileTest.exist?("/dev/cciss/")
+		if FileTest.exist?("/dev/cciss/")
+			true
+		else
+			''
+		end
 	end
 end
 
 Facter.add("ThreeWarecontroller") do
 	confine :kernel => :linux
 	setcode do
-		is3w = "false"
+		is3w = ''
 		if FileTest.exist?("/proc/scsi/scsi")
 			IO.foreach("/proc/scsi/scsi") { |x|
-				is3w = "true" if x =~ /Vendor: 3ware/
+				is3w = true if x =~ /Vendor: 3ware/
 			}
 		end
-		is3w == "true"
+		is3w
 	end
 end
 
 Facter.add("megaraid") do
 	confine :kernel => :linux
 	setcode do
-		FileTest.exist?("/dev/megadev0")
+		if FileTest.exist?("/dev/megadev0")
+			true
+		else
+			''
+		end
 	end
 end
 
 Facter.add("mptraid") do
+	confine :kernel => :linux
 	setcode do
-		FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt0") or FileTest.exist?("/proc/mpt/summary")
+		if FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt0") or FileTest.exist?("/proc/mpt/summary")
+			true
+		else
+			''
+		end
 	end
 end
 
 Facter.add("aacraid") do
 	confine :kernel => :linux
 	setcode do
-		FileTest.exist?("/dev/aac0")
+		if FileTest.exist?("/dev/aac0")
+			true
+		else
+			''
+		end
 	end
 end
 
 Facter.add("swraid") do
 	confine :kernel => :linux
 	setcode do
-                swraid = "false"
+                swraid = ''
 		if FileTest.exist?("/proc/mdstat") && FileTest.exist?("/sbin/mdadm")
                         IO.foreach("/proc/mdstat") { |x|
-                                swraid = "true" if x =~ /md[0-9]+ : active/
+                                swraid = true if x =~ /md[0-9]+ : active/
                         }
                 end
-                swraid == "true"
+                swraid
 	end
 end