components/ruby/facter/patches/facter-01-FACT-654.patch
author Kristina Tripp <Kristina.Tripp@oracle.com>
Mon, 20 Oct 2014 13:13:15 -0700
branchs11u2-sru
changeset 3407 e5c7eb70e0b8
permissions -rw-r--r--
18354422 facter cannot parse the output of GNU uptime 18960283 problem in UTILITY/PUPPET 18960296 Update Facter to 2.1.0 19357281 facter --help doesn't work 19402424 puppet error when no swap devices configured 19646677 facter-19 package not installed if ruby-19 not installed 19596952 Update facter 2.1.0 license 17797881 Add facter support for ldoms

Patch for FACT-654 facter ldom.rb generates virtinfo usage error on Solaris 11.2 x86
Upstream bug: https://tickets.puppetlabs.com/browse/FACT-654
--- facter-2.1.0/lib/facter/ldom.rb.orig	2014-08-13 17:15:34.284330702 -0600
+++ facter-2.1.0/lib/facter/ldom.rb	2014-08-13 17:16:13.476092829 -0600
@@ -1,4 +1,6 @@
-if Facter.value(:kernel) == 'SunOS' and Facter::Core::Execution.which('virtinfo')
+if Facter.value(:kernel) == 'SunOS' and
+    Facter.value(:hardwareisa) == 'sparc' and
+    Facter::Core::Execution.which('virtinfo')
   virtinfo = Facter::Core::Execution.exec('virtinfo -ap')
 
   # Convert virtinfo parseable output format to array of arrays.