summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-03-17 20:51:29 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-03-17 20:51:29 +1100
commitadd6d4763b82ff45c7582f15fab84867ac2ef1a3 (patch)
treea0e18bef4d1485fe76a1dc05071e7df953875e88
parent8def362b73ffc218b68f6953bdcc3c8540caf5dd (diff)
downloadfacter-add6d4763b82ff45c7582f15fab84867ac2ef1a3.tar.gz
facter-add6d4763b82ff45c7582f15fab84867ac2ef1a3.tar.xz
facter-add6d4763b82ff45c7582f15fab84867ac2ef1a3.zip
Fixed #2081 - Fixed interfaces fact for vlan subinterfaces
-rw-r--r--CHANGELOG2
-rw-r--r--lib/facter/util/ip.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 952f88d..b6dabab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.6.x:
+ Fixed #2081 - Fixed interfaces fact for vlan subinterfaces
+
Fixed #2063 - added kernelmajversion fact
Fixed #2055 - SunoS Interface error
diff --git a/lib/facter/util/ip.rb b/lib/facter/util/ip.rb
index 5469f73..55b5e92 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+/)
+ int = output.scan(/^\w+[.:]?\d+[.:]?\d*/)
else
[]
end