From: Stephen Gran <steve@lobefin.net>
Date: Wed, 5 Aug 2009 07:54:20 +0000 (+0100)
Subject: We know where lspci wil be
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=39628d1347fbefd60f9fe6763f64a0fe5e42cff9;p=mirror%2Fdsa-puppet.git

We know where lspci wil be
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index acf5ae219..31d5b7938 100644
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -3,9 +3,8 @@ Facter.add("smartarraycontroller") do
 	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|
+		if ((FileTest.executable?("/usr/bin/lspci")) && (FileTest.exist?("/proc/bus/pci")))
+			%x{lspci}.each { |s|
 				ishp = "true" if s =~ /RAID bus controller: (.*) Smart Array/
 			}
 		end