Commit 6d384661 authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Merge branch 'master' into drop_support_for_fr2

parents 96d7bafd 8c7e6214
......@@ -2,6 +2,9 @@
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
......
......@@ -2,6 +2,9 @@
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
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment