diff options
| author | Luke Kanies <luke@madstop.com> | 2008-08-18 18:40:32 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-08-18 18:40:32 -0500 |
| commit | 095eb15e5e202983735dc407b68982cbc20e2d5d (patch) | |
| tree | 807fb754b04f165cd48eff56d6a40c7a3524d061 /lib | |
| parent | 52365322614961775d078c6049efcd9fb318611d (diff) | |
Applied patch by josb to fix CentOS version detection.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facter/operatingsystemrelease.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb index f52d5e4..19d5869 100644 --- a/lib/facter/operatingsystemrelease.rb +++ b/lib/facter/operatingsystemrelease.rb @@ -29,11 +29,11 @@ end Facter.add(:operatingsystemrelease) do confine :operatingsystem => %w{CentOS} setcode do - centosrelease = Facter::Util::Resolution.exec('cat /etc/redhat-release | sed -e \'s/CentOS release//g\' -e \'s/(Final)//g\'') - if centosrelease =~ /^5^/ + centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \((Branch|Final)\)//' /etc/redhat-release") + if centos_release =~ /5/ release = Facter::Util::Resolution.exec('rpm -q --qf \'%{VERSION}.%{RELEASE}\' centos-release | cut -d. -f1,2') else - release = Facter::Util::Resolution.exec('cat /etc/redhat-release | sed -e \'s/CentOS release//g\' -e \'s/(Final)//g\'') + release = centos_release end end end |
