From: Tom Hughes <tom@compton.nu>
Date: Thu, 7 Jun 2018 14:08:22 +0000 (+0100)
Subject: Don't require sysv-rc-conf on Ubuntu 18.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5130b3265641a18c3aff2908b838e94fe4cf0d05?hp=a040a379c89649bc38b9513d095de1d3b1ea536e

Don't require sysv-rc-conf on Ubuntu 18.04
---

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index b0dc2bb9c..a8afec012 100644
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -32,12 +32,15 @@ package %w[
   usbutils
   numactl
   xfsprogs
-  sysv-rc-conf
   iotop
   lvm2
   rsyslog
 ]
 
+if node[:lsb][:release].to_f < 18.04
+  package "sysv-rc-conf"
+end
+
 service "rsyslog" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true