]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
We know where lspci wil be
authorStephen Gran <steve@lobefin.net>
Wed, 5 Aug 2009 07:54:20 +0000 (08:54 +0100)
committerStephen Gran <steve@lobefin.net>
Wed, 5 Aug 2009 07:54:20 +0000 (08:54 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
facts/raidarray.rb

index acf5ae219550381a3baf9fb54729c3301d18b1d9..31d5b7938d4cffe39d542a07717628a50c690e36 100644 (file)
@@ -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