components/ruby/facter/patches/facter-01-FACT-654.patch
branchs11u2-sru
changeset 3407 e5c7eb70e0b8
equal deleted inserted replaced
3406:ccfa5fe625db 3407:e5c7eb70e0b8
       
     1 Patch for FACT-654 facter ldom.rb generates virtinfo usage error on Solaris 11.2 x86
       
     2 Upstream bug: https://tickets.puppetlabs.com/browse/FACT-654
       
     3 --- facter-2.1.0/lib/facter/ldom.rb.orig	2014-08-13 17:15:34.284330702 -0600
       
     4 +++ facter-2.1.0/lib/facter/ldom.rb	2014-08-13 17:16:13.476092829 -0600
       
     5 @@ -1,4 +1,6 @@
       
     6 -if Facter.value(:kernel) == 'SunOS' and Facter::Core::Execution.which('virtinfo')
       
     7 +if Facter.value(:kernel) == 'SunOS' and
       
     8 +    Facter.value(:hardwareisa) == 'sparc' and
       
     9 +    Facter::Core::Execution.which('virtinfo')
       
    10    virtinfo = Facter::Core::Execution.exec('virtinfo -ap')
       
    11  
       
    12    # Convert virtinfo parseable output format to array of arrays.