diff --git a/puppet/lib/puppet/provider/service/openbsd.rb b/puppet/lib/puppet/provider/service/openbsd.rb index c9d0803..4cbae15 100644 --- a/puppet/lib/puppet/provider/service/openbsd.rb +++ b/puppet/lib/puppet/provider/service/openbsd.rb @@ -11,14 +11,6 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do def rcconf() '/etc/rc.conf' end def rcconf_local() '/etc/rc.conf.local' end - def pkg_scripts_var() - if Facter["operatingsystemrelease"].value == "4.9" - return "rc_scripts" - else - return "pkg_scripts" - end - end - def rcscript return File.join(rc_dir, @resource[:name]) end @@ -61,8 +53,8 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do def pkg_scripts File.open(rcconf_local).each do |line| - if line =~ /^#{pkg_scripts_var}=/ - return line.strip.gsub(/#{pkg_scripts_var}="?([^"]*)"?/, '\1').split + if line =~ /^pkg_scripts=/ + return line.strip.gsub(/pkg_scripts="?([^"]*)"?/, '\1').split end end Array.new @@ -93,7 +85,7 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do binary = @resource[:binary] s = "" File.open(rcconf_local).each do |line| - next if line =~ /^(#{rcvar_name}|#{pkg_scripts_var})=/ + next if line =~ /^(#{rcvar_name}|pkg_scripts)=/ s += line end unless start.nil? @@ -109,7 +101,7 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do s += "%s=YES\n" % rcvar_name end pkg_scripts << name if rcvar.nil? and not pkg_scripts.include?(name) - s += "#{pkg_scripts_var}=\"%s\"\n" % pkg_scripts.join(" ") + s += "pkg_scripts=\"%s\"\n" % pkg_scripts.join(" ") File.open(rcconf_local, "w") { |f| f << s } end @@ -120,12 +112,12 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do pkg_scripts = self.pkg_scripts s = "" File.open(rcconf_local).each do |line| - next if line =~ /^(#{rcvar_name}|#{pkg_scripts_var})=/ + next if line =~ /^(#{rcvar_name}|pkg_scripts)=/ s += line end s += "%s=NO\n" % rcvar_name unless rcvar.nil? pkg_scripts.delete(name) - s += "#{pkg_scripts_var}=\"%s\"\n" % pkg_scripts.join(" ") + s += "pkg_scripts=\"%s\"\n" % pkg_scripts.join(" ") File.open(rcconf_local, "w") { |f| f << s } end