diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-10 12:41:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 12:41:57 -0700 |
| commit | 68b30557bcdecc496bcca2a8d99a87da1ab159be (patch) | |
| tree | 75d4d93b95755f0f2ba38cb87fe19aa8151a9a19 | |
| parent | 30066e26ea712c4170d3dbca948af6b9a3cdc3b3 (diff) | |
| parent | 626ac783261a925f6ea84aee014bdb49f7e5512c (diff) | |
| download | ohai-68b30557bcdecc496bcca2a8d99a87da1ab159be.tar.gz | |
Merge pull request #1272 from chef/sles
Correctly detect SLES 15 systems as "suse" platform
| -rw-r--r-- | lib/ohai/plugins/linux/platform.rb | 2 | ||||
| -rw-r--r-- | spec/unit/plugins/linux/platform_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb index 39f2b602..25c77cc4 100644 --- a/lib/ohai/plugins/linux/platform.rb +++ b/lib/ohai/plugins/linux/platform.rb @@ -291,7 +291,7 @@ Ohai.plugin(:Platform) do # We have to do this for compatibility reasons, or older OS releases might get different # "platform" or "platform_version" attributes (e.g. SLES12, RHEL7). elsif File.exist?("/etc/os-release") - platform os_release_info["ID"] + platform os_release_info["ID"] == "sles" ? "suse" : os_release_info["ID"] # SLES is wrong. We call it SUSE platform_version os_release_info["VERSION_ID"] # platform_family also does not need to be hardcoded anymore. # This would be the correct way, but we stick with "determine_platform_family" for compatibility reasons. diff --git a/spec/unit/plugins/linux/platform_spec.rb b/spec/unit/plugins/linux/platform_spec.rb index bf84d9b9..d8ea722b 100644 --- a/spec/unit/plugins/linux/platform_spec.rb +++ b/spec/unit/plugins/linux/platform_spec.rb @@ -709,6 +709,7 @@ CISCO_RELEASE let(:os_release_content) do <<~OS_RELEASE + NAME="SLES" VERSION="15" VERSION_ID="15" PRETTY_NAME="SUSE Linux Enterprise Server 15" @@ -727,7 +728,7 @@ OS_RELEASE it "correctly detects SLES15" do @plugin.run - expect(@plugin[:platform]).to eq("sles") + expect(@plugin[:platform]).to eq("suse") expect(@plugin[:platform_version]).to eq("15") expect(@plugin[:platform_family]).to eq("suse") end |