diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-03-07 11:59:58 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2011-03-07 12:00:13 +1100 |
| commit | 52026ee4dbf5544419e118422161c7cc8ec1ead8 (patch) | |
| tree | d77ac5dc89ed5e499ddce457ac43b1749dc0bf43 /lib/facter/processor.rb | |
| parent | 7dd730d4cd7aebf0552647632e709570f15831ec (diff) | |
| download | facter-52026ee4dbf5544419e118422161c7cc8ec1ead8.tar.gz facter-52026ee4dbf5544419e118422161c7cc8ec1ead8.tar.xz facter-52026ee4dbf5544419e118422161c7cc8ec1ead8.zip | |
Fixed #5699 - Added processorcount support for S390x
Patch from Hector Rivas
Diffstat (limited to 'lib/facter/processor.rb')
| -rw-r--r-- | lib/facter/processor.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/facter/processor.rb b/lib/facter/processor.rb index ac75867..c71bad4 100644 --- a/lib/facter/processor.rb +++ b/lib/facter/processor.rb @@ -17,6 +17,9 @@ if ["Linux", "GNU/kFreeBSD"].include? Facter.value(:kernel) elsif l =~ /model name\s+:\s+(.*)\s*$/ processor_list[processor_num] = $1 unless processor_num == -1 processor_num = -1 + elsif l =~ /processor\s+(\d+):\s+(.*)/ + processor_num = $1.to_i + processor_list[processor_num] = $2 unless processor_num == -1 end end end @@ -80,9 +83,9 @@ if Facter.value(:kernel) == "OpenBSD" Facter::Util::Resolution.exec("uname -p") end end - + Facter.add("ProcessorCount") do - confine :kernel => :openbsd + confine :kernel => :openbsd setcode do Facter::Util::Resolution.exec("sysctl hw.ncpu | cut -d'=' -f2") end |