diff options
| author | Tim Smith <tsmith@chef.io> | 2016-02-09 09:50:05 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2016-02-09 09:50:05 -0800 |
| commit | ec92e2266218f71105e8c3068fdfe7f1c3a15c36 (patch) | |
| tree | 81dcecc8d4694893ff49730df9da69e422a4044c /lib/ohai/mixin/dmi_decode.rb | |
| parent | d21eea3de3e85a778e5d2b684f904406b673d43a (diff) | |
| parent | 0135f2e2deca0fafb4289b7b7c7ef8bc0151e74c (diff) | |
| download | ohai-ec92e2266218f71105e8c3068fdfe7f1c3a15c36.tar.gz | |
Merge pull request #714 from tas50/azure_detection
Detect Azure using the Azure agent and DHCP options
Diffstat (limited to 'lib/ohai/mixin/dmi_decode.rb')
| -rw-r--r-- | lib/ohai/mixin/dmi_decode.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ohai/mixin/dmi_decode.rb b/lib/ohai/mixin/dmi_decode.rb index 755afda0..1b3ba625 100644 --- a/lib/ohai/mixin/dmi_decode.rb +++ b/lib/ohai/mixin/dmi_decode.rb @@ -22,10 +22,10 @@ module ::Ohai::Mixin::DmiDecode case line when /Manufacturer: Microsoft/ if dmi_data =~ /Product Name: Virtual Machine/ - if dmi_data =~ /Version: (VS2005R2|6.0)/ - return 'virtualpc' - elsif dmi_data =~ /Version: (7.0|Hyper-V)/ + if dmi_data =~ /Version: (7.0|Hyper-V)/ return 'hyperv' + elsif dmi_data =~ /Version: (VS2005R2|6.0)/ + return 'virtualpc' elsif dmi_data =~ /Version: 5.0/ return 'virtualserver' end |