[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 074abd4d0d4823c067ef5704218d8258eb9c5ecd
Author: James Turnbull <james at lovedthanlost.net>
Date:   Thu Sep 25 14:02:15 2008 +1000

    Fixed #1609 - Added confines for the Gentoo, FreeBSD and SMF (Solaris) service providers

diff --git a/CHANGELOG b/CHANGELOG
index 04d37f3..c68c854 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
 0.24.x
+    Fixed #1609 - Added confines for the Gentoo, FreeBSD and 
+    SMF (Solaris) service providers 
+
     Fixed #1608 - Added ubuntu to defaultfor for apt provider
 
     Fixed #1607 - Added ubuntu to defaultfor for Debian service
diff --git a/lib/puppet/provider/service/freebsd.rb b/lib/puppet/provider/service/freebsd.rb
index e5d0453..95bde77 100644
--- a/lib/puppet/provider/service/freebsd.rb
+++ b/lib/puppet/provider/service/freebsd.rb
@@ -2,6 +2,8 @@
 Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     desc "FreeBSD's (and probably NetBSD?) form of ``init``-style service
         management; uses ``rc.conf.d`` for service enabling and disabling."
+ 
+    confine :operatingsystem => [:freebsd, :netbsd, :openbsd]
 
     defaultfor :operatingsystem => :freebsd
 
diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb
index adbee69..c5ba7b5 100644
--- a/lib/puppet/provider/service/gentoo.rb
+++ b/lib/puppet/provider/service/gentoo.rb
@@ -6,6 +6,8 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
     commands :update => "/sbin/rc-update"
 
+    confine :operatingsystem => :gentoo
+
     defaultfor :operatingsystem => :gentoo
 
     def self.defpath
diff --git a/lib/puppet/provider/service/smf.rb b/lib/puppet/provider/service/smf.rb
index c74ce3f..ab1fe88 100755
--- a/lib/puppet/provider/service/smf.rb
+++ b/lib/puppet/provider/service/smf.rb
@@ -7,6 +7,8 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
     defaultfor :operatingsystem => :solaris
 
+    confine :operatingsystem => :solaris
+
     commands :adm => "/usr/sbin/svcadm", :svcs => "/usr/bin/svcs"
 
     def enable

-- 
Puppet packaging for Debian