Blame 0002-976942-correct-ipaddress-non-loopback.patch
|
Sam Kottler |
77e9ec3 |
diff -uNr facter-1.6.18/lib/facter/ipaddress.rb facter-1.6.18/lib/facter/ipaddress.rb
|
|
Sam Kottler |
77e9ec3 |
--- lib/facter/ipaddress.rb 2013-03-13 14:17:44.000000000 -0400
|
|
Sam Kottler |
77e9ec3 |
+++ lib/facter/ipaddress.rb 2013-06-21 20:44:33.997664732 -0400
|
|
Sam Kottler |
77e9ec3 |
@@ -28,10 +28,14 @@
|
|
Sam Kottler |
77e9ec3 |
confine :kernel => :linux
|
|
Sam Kottler |
77e9ec3 |
setcode do
|
|
Sam Kottler |
77e9ec3 |
ip = nil
|
|
Sam Kottler |
77e9ec3 |
- if output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
|
|
Sam Kottler |
77e9ec3 |
+ output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
|
|
Sam Kottler |
77e9ec3 |
+ if output
|
|
Sam Kottler |
77e9ec3 |
regexp = /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
|
|
Sam Kottler |
77e9ec3 |
- if match = regexp.match(output)
|
|
Sam Kottler |
77e9ec3 |
- match[1] unless /^127/.match(match[1])
|
|
Sam Kottler |
77e9ec3 |
+ output.split("\n").each do |line|
|
|
Sam Kottler |
77e9ec3 |
+ match = regexp.match(line)
|
|
Sam Kottler |
77e9ec3 |
+ if match
|
|
Sam Kottler |
77e9ec3 |
+ break match[1] unless /^127/.match(match[1])
|
|
Sam Kottler |
77e9ec3 |
+ end
|
|
Sam Kottler |
77e9ec3 |
end
|
|
Sam Kottler |
77e9ec3 |
end
|
|
Sam Kottler |
77e9ec3 |
end
|