summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-06-04 15:03:12 -0700
committerGitHub <noreply@github.com>2018-06-04 15:03:12 -0700
commit2972437c3a62c0883e0cd9234c80dfaf6f89c11b (patch)
tree0e161af96f19080f1a09d3dc116b744c2f40cd59
parenta8d9ad165d92fabd3fb088423c349837388774af (diff)
parent272007fbdae409087c001555c703189e214ff827 (diff)
downloadohai-2972437c3a62c0883e0cd9234c80dfaf6f89c11b.tar.gz
Merge pull request #1201 from coderanger/m5_aws
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