components/ruby/facter/patches/facter-00-FACT-547.patch
author Kristina Tripp <Kristina.Tripp@oracle.com>
Fri, 17 Oct 2014 09:32:29 -0700
branchs11-update
changeset 3401 bd976a0fa74e
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-547 Limit the output of prtdiag on Solaris
Upstream bug: https://tickets.puppetlabs.com/browse/FACT-547
--- facter-2.1.0/lib/facter/util/manufacturer.rb.orig	2014-08-14 12:58:39.037467412 -0600
+++ facter-2.1.0/lib/facter/util/manufacturer.rb	2014-08-14 12:59:25.145156708 -0600
@@ -60,7 +60,7 @@
 
   def self.prtdiag_sparc_find_system_info()
     # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86
-    output = Facter::Core::Execution.exec('/usr/sbin/prtdiag 2>/dev/null')
+    output = Facter::Core::Execution.exec('/usr/sbin/prtdiag 2>/dev/null | /usr/bin/head')
 
     # System Configuration:  Sun Microsystems  sun4u Sun SPARC Enterprise M3000 Server
     if output and output =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/