Merge pull request #9147 from ekohl/7.x-avoid-downcase

[7.x] Avoid downcasing facts in service provider
puppetlabs · Nov 15, 2023 · d5a4b2a · d5a4b2a
2 parents 1145d44 + d231c60
commit d5a4b2a
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb
@@ -19,12 +19,9 @@ def self.defpath
   end
 
   # Debian and Ubuntu should use the Debian provider.
+  confine :false => ['Debian', 'Ubuntu'].include?(Puppet.runtime[:facter].value('operatingsystem'))
   # RedHat systems should use the RedHat provider.
-  confine :true => begin
-      os = Puppet.runtime[:facter].value(:operatingsystem).downcase
-      family = Puppet.runtime[:facter].value(:osfamily).downcase
-      !(os == 'debian' || os == 'ubuntu' || family == 'redhat')
-  end
+  confine :false => Puppet.runtime[:facter].value('osfamily') == 'RedHat'
 
   # We can't confine this here, because the init path can be overridden.
   #confine :exists => defpath