summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-05-29 09:14:19 -0700
committerGitHub <noreply@github.com>2018-05-29 09:14:19 -0700
commit6a21cd7cb96b25aff6b27b85ba4513502dc25fb2 (patch)
treed452b0cfddd69743774bb6e932ae96c70ee53b16
parentb1368e53533147d8c494ad631247a81ac64b353e (diff)
parentfc79b555acad1621c21e5decf4a59e9bfb92b15b (diff)
downloadohai-6a21cd7cb96b25aff6b27b85ba4513502dc25fb2.tar.gz
Merge pull request #1193 from cbajumpaa/Amazon-EC2
Detect virtualization on newer AWS instance types. (m5)
-rw-r--r--.gitignore1
-rw-r--r--lib/ohai/mixin/dmi_decode.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ee7d0274..8eae7fac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ coverage/
.bundle
*~
vendor
+.idea/*
diff --git a/lib/ohai/mixin/dmi_decode.rb b/lib/ohai/mixin/dmi_decode.rb
index 971911c8..d1cb87aa 100644
--- a/lib/ohai/mixin/dmi_decode.rb
+++ b/lib/ohai/mixin/dmi_decode.rb
@@ -44,6 +44,8 @@ module ::Ohai::Mixin::DmiDecode
return "bhyve"
when /Manufacturer: Veertu/
return "veertu"
+ when /Manufacturer: Amazon EC2/
+ return "amazonec2"
end
end
nil