Merge pull request #3778 from LeslieCarr/PUP-4351_provider_fix_CL

(PUP-4351) Default service type and package provider not set on CumulusL...
puppetlabs · Apr 21, 2015 · 56668af · 56668af
2 parents ffaffb9 + be9f45f
commit 56668af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
@@ -14,7 +14,7 @@
   commands :aptcache => "/usr/bin/apt-cache"
   commands :preseed => "/usr/bin/debconf-set-selections"
 
-  defaultfor :operatingsystem => [:debian, :ubuntu]
+  defaultfor :osfamily => :debian
 
   ENV['DEBIAN_FRONTEND'] = "noninteractive"
 

diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb
@@ -16,7 +16,7 @@
   # is resolved.
   commands :invoke_rc => "/usr/sbin/invoke-rc.d"
 
-  defaultfor :operatingsystem => :debian
+  defaultfor :operatingsystem => [:debian, :cumuluslinux]
 
   # Remove the symlinks
   def disable