Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/facts/ipaddresses.rb b/facts/ipaddresses.rb
index eddbe66d3ab670aeaf0b047e43225a92ce493395..01e20123d4b28c3de9fb9ca655b3b701d207c1c0 100644 (file)
--- a/facts/ipaddresses.rb
+++ b/facts/ipaddresses.rb
@@ -19,6 +19,30 @@ Facter.add("v4ips") do
         end
 end
 
+Facter.add("v4ips") do
+       confine :kernel => %w{FreeBSD}
+       setcode do
+               addrs = []
+               output = %x{/sbin/ifconfig}
+
+               output.split(/^\S/).each { |str|
+                       if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+                               tmp = $1
+                               unless tmp =~ /127\./
+                                       addrs << tmp
+                                       break
+                               end
+                       end
+               }
+
+               ret = addrs.join(",")
+               if ret.empty?
+                       ret = 'no'
+               end
+               ret
+       end
+end
+
 Facter.add("v6ips") do
         confine :kernel => :linux
         addrs = []