projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dsa -= paravoid (rt#6248)
[mirror/dsa-puppet.git]
/
modules
/
debian-org
/
lib
/
facter
/
ipaddresses.rb
diff --git
a/modules/debian-org/lib/facter/ipaddresses.rb
b/modules/debian-org/lib/facter/ipaddresses.rb
index
80b59bd
..
41f44e3
100644
(file)
--- 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")
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} .*/
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?
end
ret = addrs.join(",")
if ret.empty?
- ret = '
no
'
+ ret = ''
end
setcode do
ret
end
setcode do
ret
@@
-37,7
+37,7
@@
Facter.add("v4ips") do
ret = addrs.join(",")
if ret.empty?
ret = addrs.join(",")
if ret.empty?
- ret = '
no
'
+ ret = ''
end
ret
end
end
ret
end
@@
-47,7
+47,7
@@
Facter.add("v6ips") do
confine :kernel => :linux
addrs = []
if FileTest.exist?("/bin/ip")
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} .*/
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?
end
ret = addrs.join(",")
if ret.empty?
- ret = '
no
'
+ ret = ''
end
setcode do
ret
end
setcode do
ret