X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fipaddresses.rb;h=41f44e3a1a742a5b363d3c675e8b255aaa634462;hb=4db424dc544717746db426b3e3428e7fa4ebb785;hp=80b59bd35c8231544148c90d4a592327d850c548;hpb=4d96b30960a5287d55f2df86eb366945efc10c7b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/ipaddresses.rb b/modules/debian-org/lib/facter/ipaddresses.rb
index 80b59bd35..41f44e3a1 100644
--- a/modules/debian-org/lib/facter/ipaddresses.rb
+++ b/modules/debian-org/lib/facter/ipaddresses.rb
@@ -2,7 +2,7 @@ Facter.add("v4ips") do
 	confine :kernel => :linux
 	addrs = []
 	if FileTest.exist?("/bin/ip")
-		%x{ip addr list}.each do |line|
+		%x{ip addr list}.each_line do |line|
 			next unless line =~ /\s+inet/
 			next if line =~ /scope (link|host)/
 			if line =~ /\s+inet\s+(\S+)\/\d{1,2} .*/
@@ -12,7 +12,7 @@ Facter.add("v4ips") do
 	end
 	ret = addrs.join(",")
 	if ret.empty?
-		ret = 'no'
+		ret = ''
 	end
 	setcode do
 		ret
@@ -37,7 +37,7 @@ Facter.add("v4ips") do
 
 		ret = addrs.join(",")
 		if ret.empty?
-			ret = 'no'
+			ret = ''
 		end
 		ret
 	end
@@ -47,7 +47,7 @@ Facter.add("v6ips") do
 	confine :kernel => :linux
 	addrs = []
 	if FileTest.exist?("/bin/ip")
-		%x{ip addr list}.each do |line|
+		%x{ip addr list}.each_line do |line|
 			next unless line =~ /\s+inet/
 			next if line =~ /scope (link|host)/
 			if line =~ /\s+inet6\s+(\S+)\/\d{1,3} .*/
@@ -57,7 +57,7 @@ Facter.add("v6ips") do
 	end
 	ret = addrs.join(",")
 	if ret.empty?
-		ret = 'no'
+		ret = ''
 	end
 	setcode do
 		ret