(FACT-2892) Fix for solaris primary interface (#2227)

Author: sebastian-miclea

lib/facter/resolvers/solaris/networking.rb

@@ -27,7 +27,7 @@ def read_facts(fact_name)
               @fact_list[:primary_interface] = Facter::Util::Resolvers::Networking::PrimaryInterface.read_from_route
 
               unless @interfaces.empty?
-                @fact_list = { interfaces: @interfaces }
+                @fact_list[:interfaces] = @interfaces
                 @fact_list[:primary_interface] ||=
                   Facter::Util::Resolvers::Networking::PrimaryInterface.find_in_interfaces(@interfaces)
               end
@@ -45,7 +45,9 @@ def obtain_info_for_interface(lifreq)
             add_mac(lifreq)
             add_bindings(lifreq)
             add_mtu(lifreq)
-            @interfaces[lifreq.name][:dhcp] = Facter::Util::Resolvers::Networking::Dhcp.get(lifreq.name, @log)
+
+            dhcp = Facter::Util::Resolvers::Networking::Dhcp.get(lifreq.name, @log)
+            @interfaces[lifreq.name][:dhcp] = dhcp if dhcp
           end
 
           def add_mac(lifreq)

lib/facter/util/resolvers/networking/dhcp.rb

@@ -9,8 +9,9 @@ class << self
             def get(interface_name, log = nil)
               dhcpinfo_command = Facter::Core::Execution.which('dhcpinfo') || '/sbin/dhcpinfo'
               result = Facter::Core::Execution.execute("#{dhcpinfo_command} -i #{interface_name} ServerID", logger: log)
+              result.chomp!
 
-              result.chomp
+              result.empty? ? nil : result
             end
           end
         end