summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Williams <nath.e.will@gmail.com>2015-10-23 23:23:28 -0700
committerNathan Williams <nath.e.will@gmail.com>2015-10-23 23:23:28 -0700
commit71f1f3b75dfa7c4aea6bd23a468d1a6662a71cef (patch)
tree1336b17f7f5a68164510a91dd84a212648a7c48d
parentacf5c365ca3e5c221af386a5ffa7bb1c84a50c31 (diff)
downloadchef-71f1f3b75dfa7c4aea6bd23a468d1a6662a71cef.tar.gz
support split-usr on ubuntu platforms
-rw-r--r--lib/chef/platform/service_helpers.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/platform/service_helpers.rb b/lib/chef/platform/service_helpers.rb
index b392152651..ae95520e47 100644
--- a/lib/chef/platform/service_helpers.rb
+++ b/lib/chef/platform/service_helpers.rb
@@ -103,7 +103,7 @@ class Chef
end
def has_systemd_service_unit?(svc_name)
- %w( /etc /run /usr/lib ).any? do |load_path|
+ %w( /etc /usr/lib /lib /run ).any? do |load_path|
::File.exist?(
Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, '@')}.service")
)
@@ -112,7 +112,7 @@ class Chef
def has_systemd_unit?(svc_name)
# TODO: stop supporting non-service units with service resource
- %w( /etc /run /usr/lib ).any? do |load_path|
+ %w( /etc /usr/lib /lib /run ).any? do |load_path|
::File.exist?(Chef.path_to("#{load_path}/systemd/system/#{svc_name}"))
end
end