diff options
| author | James Turnbull <james@lovedthanlost.net> | 2009-05-12 10:01:39 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-05-12 10:01:39 +1000 |
| commit | e101faf209aa2a0ddd6d1d6598e8d243f43386e7 (patch) | |
| tree | c30099f00b6dd6a2fd563821e8933120adc1831b | |
| parent | 73e665629ce45230250afc5a354b7f9d7a0a4206 (diff) | |
| download | facter-e101faf209aa2a0ddd6d1d6598e8d243f43386e7.tar.gz facter-e101faf209aa2a0ddd6d1d6598e8d243f43386e7.tar.xz facter-e101faf209aa2a0ddd6d1d6598e8d243f43386e7.zip | |
Fixed #2131 - Facter doesn't populate lsbmajdistrelease on OEL (also OEL/OVS and other facts)
| -rw-r--r-- | lib/facter/hardwareisa.rb | 2 | ||||
| -rw-r--r-- | lib/facter/id.rb | 2 | ||||
| -rw-r--r-- | lib/facter/lsbmajdistrelease.rb | 2 | ||||
| -rw-r--r-- | lib/facter/macaddress.rb | 2 | ||||
| -rw-r--r-- | lib/facter/uniqueid.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/facter/hardwareisa.rb b/lib/facter/hardwareisa.rb index 6a67d96..45a16bc 100644 --- a/lib/facter/hardwareisa.rb +++ b/lib/facter/hardwareisa.rb @@ -1,4 +1,4 @@ Facter.add(:hardwareisa) do setcode 'uname -p', '/bin/sh' - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD OEL OVS} end diff --git a/lib/facter/id.rb b/lib/facter/id.rb index d620096..0a4067d 100644 --- a/lib/facter/id.rb +++ b/lib/facter/id.rb @@ -1,5 +1,5 @@ Facter.add(:id) do - confine :operatingsystem => %w{Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX} + confine :operatingsystem => %w{Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS} setcode "whoami" end diff --git a/lib/facter/lsbmajdistrelease.rb b/lib/facter/lsbmajdistrelease.rb index f84c3c1..e091593 100644 --- a/lib/facter/lsbmajdistrelease.rb +++ b/lib/facter/lsbmajdistrelease.rb @@ -3,7 +3,7 @@ require 'facter' Facter.add("lsbmajdistrelease") do - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo OEL OVS} setcode do if /(\d*)\./i =~ Facter.value(:lsbdistrelease) result=$1 diff --git a/lib/facter/macaddress.rb b/lib/facter/macaddress.rb index f978b17..e8f40dc 100644 --- a/lib/facter/macaddress.rb +++ b/lib/facter/macaddress.rb @@ -1,5 +1,5 @@ Facter.add(:macaddress) do - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo Ubuntu} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo Ubuntu OEL OVS} setcode do ether = [] output = %x{/sbin/ifconfig -a} diff --git a/lib/facter/uniqueid.rb b/lib/facter/uniqueid.rb index 1af4ae5..93f8a61 100644 --- a/lib/facter/uniqueid.rb +++ b/lib/facter/uniqueid.rb @@ -1,4 +1,4 @@ Facter.add(:uniqueid) do setcode 'hostid', '/bin/sh' - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS} end |