diff options
Diffstat (limited to 'lib/chef/platform/service_helpers.rb')
| -rw-r--r-- | lib/chef/platform/service_helpers.rb | 50 |
1 files changed, 19 insertions, 31 deletions
diff --git a/lib/chef/platform/service_helpers.rb b/lib/chef/platform/service_helpers.rb index 8a840b91c3..39457a5d17 100644 --- a/lib/chef/platform/service_helpers.rb +++ b/lib/chef/platform/service_helpers.rb @@ -43,33 +43,29 @@ class Chef # different services is NOT a design concern of this module. # def service_resource_providers - @service_resource_providers ||= [].tap do |service_resource_providers| - - if ::File.exist?(Chef.path_to("/usr/sbin/update-rc.d")) - service_resource_providers << :debian - end - - if ::File.exist?(Chef.path_to("/usr/sbin/invoke-rc.d")) - service_resource_providers << :invokercd - end + if ::File.exist?(Chef.path_to("/usr/sbin/update-rc.d")) + service_resource_providers << :debian + end - if ::File.exist?(Chef.path_to("/sbin/insserv")) - service_resource_providers << :insserv - end + if ::File.exist?(Chef.path_to("/usr/sbin/invoke-rc.d")) + service_resource_providers << :invokercd + end - # debian >= 6.0 has /etc/init but does not have upstart - if ::File.exist?(Chef.path_to("/etc/init")) && ::File.exist?(Chef.path_to("/sbin/start")) - service_resource_providers << :upstart - end + if ::File.exist?(Chef.path_to("/sbin/insserv")) + service_resource_providers << :insserv + end - if ::File.exist?(Chef.path_to("/sbin/chkconfig")) - service_resource_providers << :redhat - end + # debian >= 6.0 has /etc/init but does not have upstart + if ::File.exist?(Chef.path_to("/etc/init")) && ::File.exist?(Chef.path_to("/sbin/start")) + service_resource_providers << :upstart + end - if systemd_sanity_check? - service_resource_providers << :systemd - end + if ::File.exist?(Chef.path_to("/sbin/chkconfig")) + service_resource_providers << :redhat + end + if systemd_sanity_check? + service_resource_providers << :systemd end end @@ -103,18 +99,10 @@ class Chef configs end - def reset - @service_resource_providers = nil - @systemctl_path = nil - end - private def systemctl_path - if @systemctl_path.nil? - @systemctl_path = which("systemctl") - end - @systemctl_path + which("systemctl") end def systemd_sanity_check? |