summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@llnw.com>2013-10-26 14:15:10 -0700
committerBryan McLellan <btm@opscode.com>2013-11-04 13:00:04 -0800
commit0b9b6c53a9ff72cfd2630f9adb832e15bccb0e55 (patch)
treee5478a317230c057540ff1c8f1883bf60f46d70a
parenta436cd2e611a6cfb139a0964c73a3806217b1a40 (diff)
downloadohai-0b9b6c53a9ff72cfd2630f9adb832e15bccb0e55.tar.gz
Detect virtualbox guests via dmidecode so guest additions aren't
required
-rw-r--r--lib/ohai/plugins/linux/virtualization.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb
index 95b57ef4..c6fa9492 100644
--- a/lib/ohai/plugins/linux/virtualization.rb
+++ b/lib/ohai/plugins/linux/virtualization.rb
@@ -56,9 +56,6 @@ Ohai.plugin(:Virtualization) do
elsif modules =~ /^vboxdrv/
virtualization[:system] = "vbox"
virtualization[:role] = "host"
- elsif modules =~ /^vboxguest/
- virtualization[:system] = "vbox"
- virtualization[:role] = "guest"
end
end
@@ -103,6 +100,11 @@ Ohai.plugin(:Virtualization) do
virtualization[:system] = "xen"
virtualization[:role] = "guest"
end
+ when /Manufacturer: Oracle Corporation/
+ if so.stdout =~ /Product Name: VirtualBox/
+ virtualization[:system] = "vbox"
+ virtualization[:role] = "guest"
+ end
else
nil
end