[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, upstream, updated. 3a39dd8353b6308cf49522990104cc63e55d7cda
Paul Nasrat
pnasrat at googlemail.com
Fri Jan 29 17:22:41 UTC 2010
The following commit has been merged in the upstream branch:
commit 7623e254fa35a8c15a49b63ea06d28ca2a1a40d4
Author: Kurt Keller <kkathag at gmail.com>
Date: Sat Sep 5 15:45:43 2009 +0100
Fix errors when alias IP's are defined
diff --git a/lib/facter/util/ip.rb b/lib/facter/util/ip.rb
index 9fb7034..5941d38 100644
--- a/lib/facter/util/ip.rb
+++ b/lib/facter/util/ip.rb
@@ -84,6 +84,13 @@ module Facter::Util::IP
if not FileTest.executable?("/sbin/ip")
return nil
end
+ # A bonding interface can never be an alias interface. Alias
+ # interfaces do have a colon in their name and the ip link show
+ # command throws an error message when we pass it an alias
+ # interface.
+ if interface =~ /:/
+ return nil
+ end
regex = /SLAVE[,>].* (bond[0-9]+)/
ethbond = regex.match(%x{/sbin/ip link show #{interface}})
if ethbond
--
Packaging of Facter for debian
More information about the Pkg-puppet-devel
mailing list