[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, upstream, updated. 3a39dd8353b6308cf49522990104cc63e55d7cda

Paul Nasrat pnasrat at googlemail.com
Fri Jan 29 17:22:38 UTC 2010


The following commit has been merged in the upstream branch:
commit 9d846b45a8422e0391c4f0f4b1835af196958ae4
Author: Jim Pirzyk <jim+puppet at pirzyk.org>
Date:   Sun Aug 23 09:57:25 2009 -0500

    Fix #2306 netmask and ipaddress on SunOS and BSDs

diff --git a/lib/facter/ipaddress.rb b/lib/facter/ipaddress.rb
index 4c0bfe4..95cdc64 100644
--- a/lib/facter/ipaddress.rb
+++ b/lib/facter/ipaddress.rb
@@ -19,7 +19,7 @@ Facter.add(:ipaddress) do
 end
 
 Facter.add(:ipaddress) do
-    confine :kernel => %w{FreeBSD OpenBSD solaris}
+    confine :kernel => %w{FreeBSD OpenBSD}
     setcode do
         ip = nil
         output = %x{/sbin/ifconfig}
@@ -39,7 +39,7 @@ Facter.add(:ipaddress) do
 end
 
 Facter.add(:ipaddress) do
-    confine :kernel => %w{NetBSD}
+    confine :kernel => %w{NetBSD SunOS}
     setcode do
         ip = nil
         output = %x{/sbin/ifconfig -a}
diff --git a/lib/facter/netmask.rb b/lib/facter/netmask.rb
index 6ccef23..e4ddbc5 100644
--- a/lib/facter/netmask.rb
+++ b/lib/facter/netmask.rb
@@ -9,7 +9,7 @@
 require 'facter/util/netmask'
 
 Facter.add("netmask") do
-    confine :kernel => [ :sunos, :linux ]
+    confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd ]
     setcode do
         Facter::NetMask.get_netmask
     end

-- 
Packaging of Facter for debian



More information about the Pkg-puppet-devel mailing list