summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@chef.io>2016-02-02 16:10:59 -0800
committerdanielsdeleo <dan@chef.io>2016-02-02 16:10:59 -0800
commit51718497301b2ebf8fd347d776de8f343a923e39 (patch)
tree5ffb5c0e02e6e178896106548801fa504e9d6749
parent05e6dfe056896f07fe2dd4f941e571e36bbef9d8 (diff)
downloadohai-make-pnp-opt-in.tar.gz
Do not create blank attr spaces when plugin disabledmake-pnp-opt-in
-rw-r--r--lib/ohai/plugins/windows/drivers.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/ohai/plugins/windows/drivers.rb b/lib/ohai/plugins/windows/drivers.rb
index b13c99fd..91c4c8dc 100644
--- a/lib/ohai/plugins/windows/drivers.rb
+++ b/lib/ohai/plugins/windows/drivers.rb
@@ -20,12 +20,13 @@ Ohai.plugin(:Drivers) do
depends "kernel"
collect_data(:windows) do
- require 'wmi-lite/wmi'
+ if configuration(:enabled)
- kext = Mash.new
- pnp_drivers = Mash.new
+ require 'wmi-lite/wmi'
+
+ kext = Mash.new
+ pnp_drivers = Mash.new
- if configuration(:enabled)
wmi = WmiLite::Wmi.new
drivers = wmi.instances_of('Win32_PnPSignedDriver')
@@ -40,10 +41,11 @@ Ohai.plugin(:Drivers) do
kext[driver['devicename']][:date] = pnp_drivers[driver['deviceid']][:driver_date] ? pnp_drivers[driver['deviceid']][:driver_date].to_s[0..7] : nil
end
end
- end
- kernel[:pnp_drivers] = pnp_drivers
- kernel[:modules] = kext
+ kernel[:pnp_drivers] = pnp_drivers
+ kernel[:modules] = kext
+ end
end
+
end