fix shellout require idempotency

same as chef/chef#8595
`

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

3 files changed, 3 insertions, 3 deletions

diff --git a/lib/ohai/mixin/command.rb b/lib/ohai/mixin/command.rb
index f791c7f1..079ecb8a 100644
--- a/lib/ohai/mixin/command.rb
+++ b/lib/ohai/mixin/command.rb
@@ -19,7 +19,7 @@
 
 require_relative "../exception"
 require_relative "../log"
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
 
 module Ohai
   module Mixin
diff --git a/lib/ohai/plugins/scsi.rb b/lib/ohai/plugins/scsi.rb
index 0dfc80f9..412acecb 100644
--- a/lib/ohai/plugins/scsi.rb
+++ b/lib/ohai/plugins/scsi.rb
@@ -21,7 +21,7 @@ Ohai.plugin(:Lsscsi) do
   provides "scsi"
   optional true
 
-  require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+  require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
 
   collect_data(:linux) do
     devices = Mash.new
diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb
index b075c814..5698a844 100644
--- a/lib/ohai/system.rb
+++ b/lib/ohai/system.rb
@@ -28,7 +28,7 @@ require_relative "mixin/string"
 require_relative "mixin/constant_helper"
 require_relative "provides_map"
 require_relative "hints"
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
 require_relative "config"
 require "ffi_yajl" unless defined?(FFI_Yajl)