debian.rb

#
# Author:: AJ Christensen (<aj@hjksolutions.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

require 'chef/provider/service'
require 'chef/provider/service/init'
require 'chef/mixin/command'

class Chef
  class Provider
    class Service
      class Debian < Chef::Provider::Service::Init
        UPDATE_RC_D_ENABLED_MATCHES = /\/rc[\dS].d\/S|not installed/i
        
        def load_current_resource
          super
          
          @current_resource.enabled(service_currently_enabled?)
          @current_resource
        end

        def enable_service()
          run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults")
        end

        def disable_service()
          run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
        end
        
        def assert_update_rcd_available
          unless ::File.exists? "/usr/sbin/update-rc.d"
            raise Chef::Exceptions::Service, "/usr/sbin/update-rc.d does not exist!"
          end
        end
        
        def service_currently_enabled?
          assert_update_rcd_available

          status = popen4("/usr/sbin/update-rc.d -n -f #{@current_resource.service_name} remove") do |pid, stdin, stdout, stderr|
            stdout.each_line do |line|
              return true if line =~ UPDATE_RC_D_ENABLED_MATCHES
            end
            stderr.each_line do |line|
              return true if line =~ UPDATE_RC_D_ENABLED_MATCHES
            end
          end

          unless status.exitstatus == 0
            raise Chef::Exceptions::Service, "/usr/sbin/update-rc.d -n -f #{@current_resource.service_name} failed - #{status.inspect}"
          end
          
          false
        end
        
      end
    end
  end
end

gistfile2.diff

diff --git a/chef/lib/chef/provider/service/debian.rb b/chef/lib/chef/provider/s
index f7235b5..cb172db 100644
--- a/chef/lib/chef/provider/service/debian.rb
+++ b/chef/lib/chef/provider/service/debian.rb
@@ -24,7 +24,7 @@ class Chef
   class Provider
     class Service
       class Debian < Chef::Provider::Service::Init
-        UPDATE_RC_D_ENABLED_MATCHES = /etc\/rc[\dS].d\/S|not installed/i
+        UPDATE_RC_D_ENABLED_MATCHES = /\/rc[\dS].d\/S|not installed/i
         
         def load_current_resource
           super
@@ -54,6 +54,9 @@ class Chef
             stdout.each_line do |line|
               return true if line =~ UPDATE_RC_D_ENABLED_MATCHES
             end
+            stderr.each_line do |line|
+              return true if line =~ UPDATE_RC_D_ENABLED_MATCHES
+            end
           end  
 
           unless status.exitstatus == 0