Merge remote branch 'adrien/tickets/next/6613' into next

* adrien/tickets/next/6613:
  (#6613) Switch solaris macaddress fact to netstat

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/facter/macaddress.rb b/lib/facter/macaddress.rb
index 4a12384..bf23ef6 100644
--- a/lib/facter/macaddress.rb
+++ b/lib/facter/macaddress.rb
@@ -13,6 +13,18 @@ Facter.add(:macaddress) do
 end
 
 Facter.add(:macaddress) do
+    confine :operatingsystem => "Solaris"
+    setcode do
+        ether = []
+        output = Facter::Util::Resolution.exec("/usr/bin/netstat -np")
+        output.each_line do |s|
+            ether.push($1) if s =~ /(?:SPLA)\s+(\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2})/
+        end
+        ether[0]
+    end
+end
+
+Facter.add(:macaddress) do
     confine :operatingsystem => %w{FreeBSD OpenBSD}
     setcode do
     ether = []