Merge branch 'master' into drop_support_for_fr2

lib/facter/freeradius_maj_version.rb

-# Grab the FreeRADIUS version from the output of radiusd -v
-Facter.add(:freeradius_maj_version) do
-  setcode do
-    version = Facter::Core::Execution.exec('radiusd -v')
-    if version.nil?
-      version = Facter::Core::Execution.exec('freeradius -v')
-    end
-    if !version.nil?
-      version = version.split(/\n/)[0].match(/FreeRADIUS Version (\d)\.\d\.\d/)[1].to_s
-    end
-    version
-  end
-end

lib/facter/freeradius_version.rb

 # Grab the FreeRADIUS version from the output of radiusd -v
+version = Facter::Core::Execution.exec('radiusd -v')
+if version.nil?
+  version = Facter::Core::Execution.exec('freeradius -v')
+end
+
 Facter.add(:freeradius_version) do
   setcode do
-    version = Facter::Core::Execution.exec('radiusd -v')
-    if version.nil?
-      version = Facter::Core::Execution.exec('freeradius -v')
-    end
     if !version.nil?
-      version = version.split(/\n/)[0].match(/FreeRADIUS Version (\d\.\d\.\d)/)[1].to_s
+      minver = version.split(/\n/)[0].match(/FreeRADIUS Version (\d\.\d\.\d)/)[1].to_s
     end
-    version
+    minver
   end
 end
 
+Facter.add(:freeradius_maj_version) do
+  setcode do
+    if !version.nil?
+      majver = version.split(/\n/)[0].match(/FreeRADIUS Version (\d)\.\d\.\d/)[1].to_s
+    end
+    majver
+  end
+end