diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2020-08-21 16:30:54 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2020-08-21 16:30:54 -0700 |
| commit | f11b854cd189e8ad311592d507a0849cfbc0da52 (patch) | |
| tree | f1814b84c9d2a9520a59a55a13eb27feb6ee21aa /lib/ohai/system.rb | |
| parent | 654df0481f3c35c027a9afc313c74583f3d4112f (diff) | |
| download | ohai-f11b854cd189e8ad311592d507a0849cfbc0da52.tar.gz | |
Migrate to the chef-utils helpers
This replaces the which/shell_out helpers with ones from chef-utils.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/ohai/system.rb')
| -rw-r--r-- | lib/ohai/system.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb index 6cddf774..ee196414 100644 --- a/lib/ohai/system.rb +++ b/lib/ohai/system.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright (c) 2008-2019, Chef Software Inc. +# Copyright:: Copyright (c) Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,13 +22,12 @@ require_relative "log" require_relative "mash" require_relative "runner" require_relative "dsl" -require_relative "mixin/command" +require_relative "mixin/shell_out" require_relative "mixin/os" require_relative "mixin/string" require_relative "mixin/constant_helper" require_relative "provides_map" require_relative "hints" -require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) require_relative "config" require "ffi_yajl" unless defined?(FFI_Yajl) |