diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-11-08 22:45:28 -0800 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-11-08 22:49:36 -0800 |
| commit | 0fb0ef6a1c367d64e8d6b52e823038d75a025e3c (patch) | |
| tree | 95e05e79b84dee5939f4afd820c8fac3eb134e30 /lib/chef/platform/provider_priority_map.rb | |
| parent | 708e2896e76aa79f1630b15b4a08bfcb9f044474 (diff) | |
| download | chef-sersut/serv-prov-port.tar.gz | |
Merge pull request #2336 from opscode/lcg/12-systemd-fixessersut/serv-prov-port
fix systemd for Ubuntu 14.10
Conflicts:
CHANGELOG.md
spec/unit/provider/service/systemd_service_spec.rb
Diffstat (limited to 'lib/chef/platform/provider_priority_map.rb')
| -rw-r--r-- | lib/chef/platform/provider_priority_map.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/platform/provider_priority_map.rb b/lib/chef/platform/provider_priority_map.rb index ccf6ef0bbe..765dd74859 100644 --- a/lib/chef/platform/provider_priority_map.rb +++ b/lib/chef/platform/provider_priority_map.rb @@ -34,9 +34,10 @@ class Chef ], platform_family: "gentoo" priority :service, [ - # on debian-ish system if an upstart script exists that always wins - Chef::Provider::Service::Upstart, + # we can determine what systemd supports accurately Chef::Provider::Service::Systemd, + # on debian-ish system if an upstart script exists that must win over sysv types + Chef::Provider::Service::Upstart, Chef::Provider::Service::Insserv, Chef::Provider::Service::Debian, Chef::Provider::Service::Invokercd, |