X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fipaddresses.rb;h=05e3e9097a17435ef4324c672b562366302b603b;hb=5872b6aadfceee88690e528910131ec585d8388b;hp=a80fa6be3dc74d404018d99a11fcf7a45a832b5c;hpb=fd6b464b0da569ba84e2f260a666c257b5773f93;p=mirror%2Fdsa-puppet.git

diff --git a/facts/ipaddresses.rb b/facts/ipaddresses.rb
index a80fa6be3..05e3e9097 100644
--- a/facts/ipaddresses.rb
+++ b/facts/ipaddresses.rb
@@ -1,30 +1,66 @@
 Facter.add("v4ips") do
         confine :kernel => :linux
         addrs = []
-        %x{ip addr list}.each do |line|
-                next unless line =~ /\s+inet/
-                next if line =~ /scope (link|host)/
-                if line =~ /\s+inet\s+(\S+)\/\d\d .*/
-                        addrs << $1
+        if FileTest.exist?("/bin/ip")
+                %x{ip addr list}.each do |line|
+                        next unless line =~ /\s+inet/
+                        next if line =~ /scope (link|host)/
+                        if line =~ /\s+inet\s+(\S+)\/\d{1,2} .*/
+                                addrs << $1
+                        end
                 end
         end
+        ret = addrs.join(",")
+        if ret.empty?
+          ret = 'no'
+        end
         setcode do
-                addrs.join(",")
+          ret
         end
 end
 
+Facter.add("v4ips") do
+	confine :kernel => 'GNU/kFreeBSD'
+	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 = []
-        %x{ip addr list}.each do |line|
-                next unless line =~ /\s+inet/
-                next if line =~ /scope (link|host)/
-                if line =~ /\s+inet6\s+(\S+)\/\d\d .*/
-                        addrs << $1
+        if FileTest.exist?("/bin/ip")
+                %x{ip addr list}.each do |line|
+                        next unless line =~ /\s+inet/
+                        next if line =~ /scope (link|host)/
+                        if line =~ /\s+inet6\s+(\S+)\/\d{1,3} .*/
+                                addrs << $1
+                        end
                 end
         end
+        ret = addrs.join(",")
+        if ret.empty?
+          ret = 'no'
+        end
         setcode do
-                addrs.join(",")
+          ret
         end
 end