summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2018-01-02 11:25:22 -0800
committerVinson Lee <vlee@freedesktop.org>2018-01-02 11:25:22 -0800
commit5320cbf9b41789a46a5c5c0a2d818966c9716405 (patch)
treee220db3cd29ec137355ffc47023b97fb0b6149cb
parent19ea1bd1e6f01d28b29d3cccbfb7388ea5aff030 (diff)
downloadchef-5320cbf9b41789a46a5c5c0a2d818966c9716405.tar.gz
Remove update-rc.d -n (dryrun) option.
init-system-helpers 1.50 removed the broken -n (dryrun) option. https://anonscm.debian.org/git/collab-maint/init-system-helpers.git/commit/?id=e0d3d2261c91c5d3dd8a980fcc5244b3b6ce8158 Signed-off-by: Vinson Lee <vlee@freedesktop.org>
-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|