summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-09-25 13:10:06 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-09-25 13:10:06 +1000
commitaa629ec3c01de5b1bfdcb761376d1f417704fd8c (patch)
treed67db12d2d68f0641a68f8b14d9e402ea8cf4800
parent774c0f9ca8bd2e9fd0ce5fcc6a474fd0ab0aff0b (diff)
downloadpuppet-aa629ec3c01de5b1bfdcb761376d1f417704fd8c.tar.gz
puppet-aa629ec3c01de5b1bfdcb761376d1f417704fd8c.tar.xz
puppet-aa629ec3c01de5b1bfdcb761376d1f417704fd8c.zip
Fixed #1607 - Added ubuntu to defaultfor for Debian service provider
-rw-r--r--CHANGELOG3
-rwxr-xr-xlib/puppet/provider/service/debian.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d91df2084..a20053812 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
0.24.x
+ Fixed #1607 - Added ubuntu to defaultfor for Debian service
+ provider
+
Fixed #1045 - Multiple metaparams all get added to resources.
Fixed #1472 -- defined, exported resources in the current compile
diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb
index da38c10a2..ca433cbe6 100755
--- a/lib/puppet/provider/service/debian.rb
+++ b/lib/puppet/provider/service/debian.rb
@@ -5,7 +5,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
is that this supports service enabling and disabling via ``update-rc.d``."
commands :update => "/usr/sbin/update-rc.d"
- defaultfor :operatingsystem => :debian
+ defaultfor :operatingsystem => [:debian, :ubuntu]
def self.defpath
superclass.defpath