summaryrefslogtreecommitdiff
path: root/lib/chef/provider/service/solaris.rb
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2017-03-21 08:30:43 +0000
committerGitHub <noreply@github.com>2017-03-21 08:30:43 +0000
commit9ecff295ce191c3648a19402ac5412c77689cb59 (patch)
tree51cd14f8cb31656537ecf9de79dcba7216e3f386 /lib/chef/provider/service/solaris.rb
parentc9aceb575404fbdde99ec3bec969e1ee97bca68b (diff)
parent8b7485575ac607bbf518f08832f4746d2a33af30 (diff)
downloadchef-9ecff295ce191c3648a19402ac5412c77689cb59.tar.gz
Merge pull request #5551 from MarkGibbons/smf_recursive_dependencies
smf_recursive_dependencies: Allow solaris services to start recursively.
Diffstat (limited to 'lib/chef/provider/service/solaris.rb')
-rw-r--r--lib/chef/provider/service/solaris.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/provider/service/solaris.rb b/lib/chef/provider/service/solaris.rb
index f7f8eaf31b..c560bed011 100644
--- a/lib/chef/provider/service/solaris.rb
+++ b/lib/chef/provider/service/solaris.rb
@@ -56,11 +56,13 @@ class Chef
def enable_service
shell_out!(default_init_command, "clear", @new_resource.service_name) if @maintenance
- shell_out!(default_init_command, "enable", "-s", @new_resource.service_name)
+ enable_flags = [ "-s", @new_resource.options ].flatten.compact
+ shell_out!(default_init_command, "enable", *enable_flags, @new_resource.service_name)
end
def disable_service
- shell_out!(default_init_command, "disable", "-s", @new_resource.service_name)
+ disable_flags = [ "-s", @new_resource.options ].flatten.compact
+ shell_out!(default_init_command, "disable", *disable_flags, @new_resource.service_name)
end
alias_method :stop_service, :disable_service