diff options
| author | Tim Smith <tsmith@chef.io> | 2021-02-15 10:28:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 10:28:13 -0800 |
| commit | 54715bdd0b423c9bb3ac5cf6d882627e5db95d3b (patch) | |
| tree | 0b5fa9b9c5c1fc29cd7ad752120be6bdb726a9d1 /lib/chef/provider | |
| parent | 23673431874d172825e71ba82c7fac176676932e (diff) | |
| parent | c90b1c881bcbba19f5a45a675557f6566b137935 (diff) | |
| download | chef-54715bdd0b423c9bb3ac5cf6d882627e5db95d3b.tar.gz | |
Merge pull request #11038 from chef/legacy_upstart
Remove an Upstart check for Ubuntu 8.04-9.04
Diffstat (limited to 'lib/chef/provider')
| -rw-r--r-- | lib/chef/provider/service/upstart.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/chef/provider/service/upstart.rb b/lib/chef/provider/service/upstart.rb index 181aa82fe7..7c2b82dc3a 100644 --- a/lib/chef/provider/service/upstart.rb +++ b/lib/chef/provider/service/upstart.rb @@ -61,15 +61,8 @@ class Chef end end - platform, version = Chef::Platform.find_platform_and_version(run_context.node) - if platform == "ubuntu" && (8.04..9.04).cover?(version.to_f) - @upstart_job_dir = "/etc/event.d" - @upstart_conf_suffix = "" - else - @upstart_job_dir = "/etc/init" - @upstart_conf_suffix = ".conf" - end - + @upstart_job_dir = "/etc/init" + @upstart_conf_suffix = ".conf" @command_success = true # new_resource.status_command= false, means upstart used @config_file_found = true @upstart_command_success = true |