From be7c30b60414144d4238263fed5586283b30ebea Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Mon, 5 Nov 2007 20:40:31 +1100 Subject: Fixed ticket #44 --- CHANGELOG | 4 ++++ lib/facter/ipmess.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fdc5bba..998fc8e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +?: + Fixed ticket #44 and allowed support for Xen multiple interfaces and aliased + interfaces. Supports both Linux and *BSD. + 1.3.8: Fixed Rdoc::usage bug on CentOS 5 - closed Puppet #753 and Facter #40 diff --git a/lib/facter/ipmess.rb b/lib/facter/ipmess.rb index abee8a2..349d523 100644 --- a/lib/facter/ipmess.rb +++ b/lib/facter/ipmess.rb @@ -21,7 +21,7 @@ if Facter.kernel == "Linux" output = %x{/sbin/ifconfig -a} int = nil - output.scan(/^(\w+)(\d+)/) { |str| + output.scan(/^(\w+)(\.|:?)(\d+)/) { |str| output_int = %x{/sbin/ifconfig #{str}} int = "#{str}" tmp1 = nil @@ -54,7 +54,7 @@ if Facter.kernel == "FreeBSD" || Facter.kernel == "OpenBSD" || Facter.kernel == output = %x{/sbin/ifconfig -a} int = nil - output.scan(/^(\w+)(\d+):/) { |str| + output.scan(/^(\w+)(\.|:?)(\d+):/) { |str| output_int = %x{/sbin/ifconfig #{str}} int = "#{str}" tmp1 = nil -- cgit