components/ruby/facter/patches/facter-03-FACT-658.patch
branchs11u2-sru
changeset 3407 e5c7eb70e0b8
child 5860 afd31ba91ee9
equal deleted inserted replaced
3406:ccfa5fe625db 3407:e5c7eb70e0b8
       
     1 Patch for FACT-658 facter doesn't parse gnu uptime output
       
     2 Upstream bug: https://tickets.puppetlabs.com/browse/FACT-658
       
     3 --- facter-2.1.0/lib/facter/util/uptime.rb.orig	2014-08-15 10:19:59.183717181 -0600
       
     4 +++ facter-2.1.0/lib/facter/util/uptime.rb	2014-08-15 10:44:49.611645182 -0600
       
     5 @@ -76,6 +76,14 @@
       
     6    end
       
     7  
       
     8    def self.uptime_executable_cmd
       
     9 -    "uptime"
       
    10 +    if Facter.value(:kernel) == 'SunOS'
       
    11 +      # Facter doesn't work with gnu uptime
       
    12 +      # force use of /usr/bin/uptime
       
    13 +      # in case user PATH has /usr/gnu/bin
       
    14 +      # before /usr/bin
       
    15 +      "/usr/bin/uptime"
       
    16 +    else
       
    17 +      "uptime"
       
    18 +    end
       
    19    end
       
    20  end