Merge branch '0.24.x'

Conflicts:
	bin/ralsh
	lib/puppet/executables/client/certhandler.rb
	lib/puppet/parser/functions/versioncmp.rb
	lib/puppet/parser/resource/reference.rb
	lib/puppet/provider/augeas/augeas.rb
	lib/puppet/provider/nameservice/directoryservice.rb
	lib/puppet/provider/ssh_authorized_key/parsed.rb
	lib/puppet/type.rb
	lib/puppet/type/file/checksum.rb
	spec/integration/defaults.rb
	spec/integration/transaction/report.rb
	spec/unit/executables/client/certhandler.rb
	spec/unit/indirector/ssl_rsa/file.rb
	spec/unit/node/catalog.rb
	spec/unit/provider/augeas/augeas.rb
	spec/unit/rails.rb
	spec/unit/type/ssh_authorized_key.rb
	spec/unit/type/tidy.rb
	test/executables/filebucket.rb
	test/executables/puppetbin.rb

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb
index 4067dee5e..d62df1a38 100644
--- a/lib/puppet/provider/service/gentoo.rb
+++ b/lib/puppet/provider/service/gentoo.rb
@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
         return :false unless line
 
         # If it's enabled then it will print output showing service | runlevel
-        if output =~ /#{@resource[:name]}\s*\|\s*default/
+        if output =~ /#{@resource[:name]}\s*\|\s*(boot|default)/
             return :true
         else
             return :false