diff options
| -rw-r--r-- | lib/facter/operatingsystem.rb | 2 | ||||
| -rw-r--r-- | lib/facter/operatingsystemrelease.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb index 5bff78d..258fcde 100644 --- a/lib/facter/operatingsystem.rb +++ b/lib/facter/operatingsystem.rb @@ -31,6 +31,8 @@ Facter.add(:operatingsystem) do txt = File.read("/etc/SuSE-release") if txt =~ /^SUSE LINUX Enterprise Server/i "SLES" + elsif txt =~ /^openSUSE/i + "OpenSuSE" else "SuSE" end diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb index f88278a..bbf530a 100644 --- a/lib/facter/operatingsystemrelease.rb +++ b/lib/facter/operatingsystemrelease.rb @@ -56,13 +56,15 @@ Facter.add(:operatingsystemrelease) do end Facter.add(:operatingsystemrelease) do - confine :operatingsystem => %w{SLES} + confine :operatingsystem => %w{SLES OpenSuSE} setcode do releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release') if releasefile =~ /^VERSION\s*=\s*(\d+)/ releasemajor = $1 if releasefile =~ /^PATCHLEVEL\s*=\s*(\d+)/ releaseminor = $1 + elsif releasefile =~ /^VERSION\s=.*.(\d+)/ + releaseminor = $1 else releaseminor = "0" end |