Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/facter/patches/facter-01-physicalprocessor-psrinfo.patch
author Drew Fisher <drew.fisher@oracle.com>
Mon, 29 Jul 2013 16:02:38 -0600
changeset 1409 9db4ba32e740
permissions -rw-r--r--
PSARC/2013/218 Puppet Phase 2 16453463 Update Puppet's offerings on Solaris
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1409
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     1
 
Fix psrinfo output to handle kernel zones.
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     2
 
--- facter-1.6.16/lib/facter/physicalprocessorcount.rb.orig	2013-06-10 15:28:25.355442031 -0600
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     3
 
+++ facter-1.6.16/lib/facter/physicalprocessorcount.rb	2013-06-10 15:31:09.056896313 -0600
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     4
 
@@ -75,7 +75,10 @@
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     5
 
     cmd = "/usr/sbin/psrinfo"
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     6
 
     result = nil
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     7
 
     if (major_version > 5) or (major_version == 5 and minor_version >= 8) then
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     8
 
-      result = Facter::Util::Resolution.exec("#{cmd} -p")
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
     9
 
+      result = Facter::Util::Resolution.exec("#{cmd} -p 2> /dev/null")
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
    10
 
+        if result.nil?
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
    11
 
+          result = 0
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
    12
 
+        end
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
    13
 
     else
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
    14
 
       output = Facter::Util::Resolution.exec(cmd)
9db4ba32e740 PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset 
    15
 
       result = output.split("\n").length.to_s
upstream/oracle/userland-gate