diff options
| author | James Turnbull <james@lovedthanlost.net> | 2007-11-05 20:40:31 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2007-11-05 20:40:31 +1100 |
| commit | be7c30b60414144d4238263fed5586283b30ebea (patch) | |
| tree | 99322767973826a729b390a521af2eda5dfe38ff | |
| parent | 74621b50655db2e91a850946150557e3cda411cc (diff) | |
| download | facter-be7c30b60414144d4238263fed5586283b30ebea.tar.gz facter-be7c30b60414144d4238263fed5586283b30ebea.tar.xz facter-be7c30b60414144d4238263fed5586283b30ebea.zip | |
Fixed ticket #44
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/facter/ipmess.rb | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -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 |