summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-04-21 07:25:10 +1000
committerJames Turnbull <james@lovedthanlost.net>2009-04-21 07:25:10 +1000
commit7fa257689b08d5c6c8e22da9da49f0679aa9b1d9 (patch)
tree779b9ad9c5adf99a6f2d9cc75c2c75914c7b653c
parent7a819454febdf34f4384e1bc64c5b2599df4bd38 (diff)
downloadfacter-7fa257689b08d5c6c8e22da9da49f0679aa9b1d9.tar.gz
facter-7fa257689b08d5c6c8e22da9da49f0679aa9b1d9.tar.xz
facter-7fa257689b08d5c6c8e22da9da49f0679aa9b1d9.zip
Fixed #2132 - support for named interface aliases under linux
-rw-r--r--CHANGELOG4
-rw-r--r--lib/facter/util/ip.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b0f9931..ac92eaf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
-1.6.x:
+1.5.5:
+ Fixed #2132 - Support for named interfaces under Linux
+
Fixed #2080 - IPAddress resolutions should be reordered
Fixed #2078 - ip.rb errors command not found
diff --git a/lib/facter/util/ip.rb b/lib/facter/util/ip.rb
index 55b5e92..e06e506 100644
--- a/lib/facter/util/ip.rb
+++ b/lib/facter/util/ip.rb
@@ -52,7 +52,7 @@ module Facter::Util::IP
# We get lots of warnings on platforms that don't get an output
# made.
if output
- int = output.scan(/^\w+[.:]?\d+[.:]?\d*/)
+ int = output.scan(/^\w+[.:]?\d+[.:]?\d*[.:]?\w*/)
else
[]
end