2c2eff30c6
Copy sysutils/puppet4 to sysutils/puppet5 and update. With this update, we switched the default facter implementation from ruby (sysutils/rubygem-facter) to C++ (sysutils/facter). The legacy implementation can still be chosen with options. With hat: puppet
20 lines
755 B
Ruby
20 lines
755 B
Ruby
--- lib/puppet/provider/service/daemontools.rb.orig 2016-04-25 18:52:09 UTC
|
|
+++ lib/puppet/provider/service/daemontools.rb
|
|
@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :dae
|
|
|
|
EOT
|
|
|
|
- commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
|
|
+ commands :svc => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat"
|
|
|
|
class << self
|
|
attr_writer :defpath
|
|
@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :dae
|
|
# 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
|