diff options
| author | Tim Smith <tsmith@llnw.com> | 2014-04-27 10:35:53 -0700 |
|---|---|---|
| committer | Bryan McLellan <btm@getchef.com> | 2014-05-15 08:21:41 -0700 |
| commit | 17681c94b553f6512d81e67117293f90f3eccffa (patch) | |
| tree | ba2f8d6f40a9ec452b50ec93f831a1855cd27500 | |
| parent | 5d161814a8c195eed9b93c675d156b62dd41ad30 (diff) | |
| download | ohai-17681c94b553f6512d81e67117293f90f3eccffa.tar.gz | |
Present all CPU flags on FreeBSD
Don’t toss the first set when we find a few more
| -rw-r--r-- | lib/ohai/plugins/freebsd/cpu.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/plugins/freebsd/cpu.rb b/lib/ohai/plugins/freebsd/cpu.rb index 1a9c97cf..8fdb5a38 100644 --- a/lib/ohai/plugins/freebsd/cpu.rb +++ b/lib/ohai/plugins/freebsd/cpu.rb @@ -39,9 +39,9 @@ Ohai.plugin(:CPU) do when /Origin = "(.+)"\s+Id = (.+)\s+Stepping = (.+)/ cpuinfo["vendor_id"] = $1 cpuinfo["stepping"] = $3 - # These _should_ match /AMD Features2?/ lines as well + # These _should_ match /AMD Features2?/ lines as well when /Features=.+<(.+)>/ - cpuinfo["flags"] = $1.downcase.split(',') + cpuinfo["flags"].concat($1.downcase.split(',')) # Features2=0x80000001<SSE3,<b31>> when /Features2=[a-f\dx]+<(.+)>/ cpuinfo["flags"].concat($1.downcase.split(',')) |