ports/sysutils/puppet7/files/patch-lib_puppet_provider_service_daemontools.rb
Romain Tartière 91e0606182
sysutils/puppet7: Update to 7.24.0
Release notes:
https://www.puppet.com/docs/puppet/7/release_notes_puppet.html#release_notes_puppet_x-7-24-0

While here, cope with incompatible concurrent-ruby version installed
beside the needed one [1].

With hat:	puppet
PR:		270482 [1]
Reported by:	freebsd@wb9.se [1]
2023-04-09 23:10:54 -10:00

20 lines
783 B
Ruby

--- lib/puppet/provider/service/daemontools.rb.orig 2023-03-27 22:00:42 UTC
+++ lib/puppet/provider/service/daemontools.rb
@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :daemontools, :par
EOT
- commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
+ commands :svc => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat"
class << self
attr_writer :defpath
@@ -86,7 +86,7 @@ Puppet::Type.type(:service).provide :daemontools, :par
# find the service dir on this node
def servicedir
unless @servicedir
- ["/service", "/etc/service","/var/lib/svscan"].each do |path|
+ ["/var/service", "/etc/service","/var/lib/svscan"].each do |path|
if Puppet::FileSystem.exist?(path)
@servicedir = path
break