summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2018-01-22 18:18:53 +0000
committerGitHub <noreply@github.com>2018-01-22 18:18:53 +0000
commit4541b1bd224ca05cec66bf49acd709801d38d942 (patch)
treecdd3697125338eda5ed02ba6b9771569debee1c1
parentb3ebf7a0cd6df0c899e7547b3c331f2ece7918b5 (diff)
parent5320cbf9b41789a46a5c5c0a2d818966c9716405 (diff)
downloadchef-4541b1bd224ca05cec66bf49acd709801d38d942.tar.gz
Merge pull request #6723 from vinsonlee/remove-update-rc.d-dryrun-option
Remove update-rc.d -n (dryrun) option.
-rw-r--r--lib/chef/provider/service/debian.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/provider/service/debian.rb b/lib/chef/provider/service/debian.rb
index 58a43d27f8..fcfa34ddf9 100644
--- a/lib/chef/provider/service/debian.rb
+++ b/lib/chef/provider/service/debian.rb
@@ -53,7 +53,7 @@ class Chef
requirements.assert(:all_actions) do |a|
a.assertion { @so_priority.exitstatus == 0 }
- a.failure_message Chef::Exceptions::Service, "/usr/sbin/update-rc.d -n -f #{current_resource.service_name} failed - #{@so_priority.inspect}"
+ a.failure_message Chef::Exceptions::Service, "/usr/sbin/update-rc.d -f #{current_resource.service_name} failed - #{@so_priority.inspect}"
# This can happen if the service is not yet installed,so we'll fake it.
a.whyrun ["Unable to determine priority of service, assuming service would have been correctly installed earlier in the run.",
"Assigning temporary priorities to continue.",
@@ -73,7 +73,7 @@ class Chef
def get_priority
priority = {}
- @so_priority = shell_out!("/usr/sbin/update-rc.d -n -f #{current_resource.service_name} remove")
+ @so_priority = shell_out!("/usr/sbin/update-rc.d -f #{current_resource.service_name} remove")
[@so_priority.stdout, @so_priority.stderr].each do |iop|
iop.each_line do |line|