diff options
| author | Andreas Zuber <zuber@puzzle.ch> | 2009-05-01 12:10:11 +0200 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-05-10 21:50:54 +1000 |
| commit | 23a5b3db4f73e85c34dc917bc191f37b31910dcb (patch) | |
| tree | 738d7db02d7addf34fc4eaa634cb0de54a335011 | |
| parent | e93b1e6a11936715727157a18e833c42acf898eb (diff) | |
| download | facter-23a5b3db4f73e85c34dc917bc191f37b31910dcb.tar.gz facter-23a5b3db4f73e85c34dc917bc191f37b31910dcb.tar.xz facter-23a5b3db4f73e85c34dc917bc191f37b31910dcb.zip | |
Fixed #2215 - Added support for SUSE Linux Enterprise Desktop to operatingsystem and operatingsystemrelease
| -rw-r--r-- | lib/facter/operatingsystem.rb | 2 | ||||
| -rw-r--r-- | lib/facter/operatingsystemrelease.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb index eacc7b3..704b48f 100644 --- a/lib/facter/operatingsystem.rb +++ b/lib/facter/operatingsystem.rb @@ -39,6 +39,8 @@ Facter.add(:operatingsystem) do txt = File.read("/etc/SuSE-release") if txt =~ /^SUSE LINUX Enterprise Server/i "SLES" + elsif txt =~ /^SUSE LINUX Enterprise Desktop/i + "SLED" elsif txt =~ /^openSUSE/i "OpenSuSE" else diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb index 25a226d..d6e6e86 100644 --- a/lib/facter/operatingsystemrelease.rb +++ b/lib/facter/operatingsystemrelease.rb @@ -80,7 +80,7 @@ Facter.add(:operatingsystemrelease) do end Facter.add(:operatingsystemrelease) do - confine :operatingsystem => %w{SLES OpenSuSE} + confine :operatingsystem => %w{SLES SLED OpenSuSE} setcode do releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release') if releasefile =~ /^VERSION\s*=\s*(\d+)/ |