summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Kantrowitz <noah@coderanger.net>2016-07-29 13:21:37 -0700
committerNoah Kantrowitz <noah@coderanger.net>2016-07-29 13:21:37 -0700
commit28b4907f41cd7b2247bd90438d13b1bd2763d3d5 (patch)
tree294dabcbe2cab8b22c122d50612a1a6bad37db3f
parent32b527ea14246f2410f7941e899879d7f9c2ee0d (diff)
downloadohai-28b4907f41cd7b2247bd90438d13b1bd2763d3d5.tar.gz
Also fix DmiDecode mixin.
-rw-r--r--lib/ohai/plugins/bsd/virtualization.rb3
-rw-r--r--lib/ohai/plugins/linux/virtualization.rb3
-rw-r--r--lib/ohai/plugins/solaris2/virtualization.rb2
3 files changed, 3 insertions, 5 deletions
diff --git a/lib/ohai/plugins/bsd/virtualization.rb b/lib/ohai/plugins/bsd/virtualization.rb
index f6a791ef..46304982 100644
--- a/lib/ohai/plugins/bsd/virtualization.rb
+++ b/lib/ohai/plugins/bsd/virtualization.rb
@@ -19,9 +19,8 @@
require "ohai/mixin/dmi_decode"
-include Ohai::Mixin::DmiDecode
-
Ohai.plugin(:Virtualization) do
+ include Ohai::Mixin::DmiDecode
provides "virtualization"
collect_data(:freebsd, :openbsd, :netbsd, :dragonflybsd) do
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb
index 32e28e0e..145ec953 100644
--- a/lib/ohai/plugins/linux/virtualization.rb
+++ b/lib/ohai/plugins/linux/virtualization.rb
@@ -18,9 +18,8 @@
require "ohai/mixin/dmi_decode"
-include Ohai::Mixin::DmiDecode
-
Ohai.plugin(:Virtualization) do
+ include Ohai::Mixin::DmiDecode
provides "virtualization"
def lxc_version_exists?
diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb
index 7518cb41..bca7b6eb 100644
--- a/lib/ohai/plugins/solaris2/virtualization.rb
+++ b/lib/ohai/plugins/solaris2/virtualization.rb
@@ -19,9 +19,9 @@
#
require "ohai/mixin/dmi_decode"
-include Ohai::Mixin::DmiDecode
Ohai.plugin(:Virtualization) do
+ include Ohai::Mixin::DmiDecode
provides "virtualization"
def collect_solaris_guestid