Merge branch '0.24.x' into merging

Conflicts:

	test/ral/type/filesources.rb

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index e2d6ac947..3fad8bcfe 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -50,10 +50,22 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     end
  
     def restart
-        if @resource[:hasrestart] == true
+        if @resource[:hasrestart] == :true
               service(@resource[:name], "restart")
         else
-           return false
+           super
+        end
+    end
+
+    def status
+        if @resource[:hasstatus] == :true
+              begin 
+                  service(@resource[:name], "status")
+              rescue 
+                  return :stopped
+              end 
+        else
+           super
         end
     end