(FACT-2714) Check if dhcpinfo command is in path, if it is not, defau…

…lt to solaris 10 path.
puppetlabs · Aug 6, 2020 · bdc64d6 · bdc64d6
1 parent 6b97bb4
commit bdc64d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/facter/resolvers/solaris/ffi/ffi.rb b/lib/facter/resolvers/solaris/ffi/ffi.rb
@@ -20,6 +20,11 @@ module FFI
         INET_ADDRSTRLEN   = 16
         INET6_ADDRSTRLEN  = 46
       end
+
+      BINDINGS_KEY = {
+        FFI::AF_INET => :bindings,
+        FFI::AF_INET6 => :bindings6
+      }.freeze
     end
   end
 end
diff --git a/lib/facter/resolvers/solaris/networking_resolver.rb b/lib/facter/resolvers/solaris/networking_resolver.rb
@@ -12,11 +12,6 @@ class Networking < BaseResolver
         @fact_list ||= {}
         @interfaces = {}
 
-        BINDINGS_KEY = {
-          FFI::AF_INET => :bindings,
-          FFI::AF_INET6 => :bindings6
-        }.freeze
-
         class << self
           private
 
@@ -141,7 +136,8 @@ def primary_interface
           end
 
           def add_dhcp(interface_name)
-            result = Facter::Core::Execution.execute("dhcpinfo -i #{interface_name} ServerID", logger: log)
+            dhcpinfo_command = Facter::Core::Execution.which('dhcpinfo') || '/sbin/dhcpinfo'
+            result = Facter::Core::Execution.execute("#{dhcpinfo_command} -i #{interface_name} ServerID", logger: log)
 
             @interfaces[interface_name][:dhcp] = result.chomp
           end