diff options
| author | Nate Walck <nwalck@fb.com> | 2015-06-25 11:52:07 -0700 |
|---|---|---|
| committer | Nate Walck <nwalck@fb.com> | 2015-06-25 11:52:07 -0700 |
| commit | 27dc8b7bc9cc5f7ba553c83072215132c840c3ef (patch) | |
| tree | 58f16f0aa383da9648e40f594ba5c55500198cd6 | |
| parent | cf3bbb0dcd78dde44394cf0dda70d7ceef097b9b (diff) | |
| download | chef-27dc8b7bc9cc5f7ba553c83072215132c840c3ef.tar.gz | |
Added support for 10.11 and added function for evaluating OS X versions for future feature gating
| -rw-r--r-- | lib/chef/provider/service/macosx.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb index 7324822eff..0a8fca4262 100644 --- a/lib/chef/provider/service/macosx.rb +++ b/lib/chef/provider/service/macosx.rb @@ -42,6 +42,10 @@ class Chef PLIST_DIRS = gather_plist_dirs + def this_version_or_newer?(this_version) + Gem::Version.new(node['platform_version']) >= Gem::Version.new(this_version) + end + def load_current_resource @current_resource = Chef::Resource::MacosxService.new(@new_resource.name) @current_resource.service_name(@new_resource.service_name) @@ -56,7 +60,7 @@ class Chef @console_user = Etc.getlogin Chef::Log.debug("#{new_resource} console_user: '#{@console_user}'") cmd = "su " - param = !node['platform_version'].include?('10.10') ? '-l ' : '' + param = this_version_or_newer?('10.10') ? '' : '-l ' @base_user_cmd = cmd + param + "#{@console_user} -c" # Default LauchAgent session should be Aqua @session_type = 'Aqua' if @session_type.nil? |