diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-01-15 16:57:51 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-01-15 16:57:51 -0800 |
| commit | f5013a31e91e3a43b301a90d4ce92c41f2d58c19 (patch) | |
| tree | 3f9a151ecde2651545e540ad3d48027cb8c9fbcf | |
| parent | 95acf4e9aeceefc1edaf18873617a3f51eda9c4d (diff) | |
| download | ohai-f5013a31e91e3a43b301a90d4ce92c41f2d58c19.tar.gz | |
OHAI-525: reverting part of OHAI-525
dmidecode isn't necessarily installed by default (fedora 20), while
the existing /proc/modules detection works fine. i don't see why we
only need one mechanism, so try both and use which one works.
| -rw-r--r-- | lib/ohai/plugins/linux/virtualization.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb index 39c1f846..eedf257f 100644 --- a/lib/ohai/plugins/linux/virtualization.rb +++ b/lib/ohai/plugins/linux/virtualization.rb @@ -56,6 +56,9 @@ Ohai.plugin(:Virtualization) do elsif modules =~ /^vboxdrv/ virtualization[:system] = "vbox" virtualization[:role] = "host" + elsif modules =~ /^vboxguest/ + virtualization[:system] = "vbox" + virtualization[:role] = "guest" end end |