Skip to content

Commit

Permalink
Merge pull request #1320 from chef/antergos
Browse files Browse the repository at this point in the history
Add support for antergos linux and fix opensuseleap platform_family
  • Loading branch information
tas50 authored Dec 3, 2018
2 parents ff3f54c + 94e8c45 commit 534acc4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions lib/ohai/plugins/linux/platform.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def platform_family_from_platform(plat)
"rhel"
when /amazon/
"amazon"
when /suse/, /sles/, /opensuse/
when /suse/, /sles/, /opensuse/, /opensuseleap/
"suse"
when /fedora/, /pidora/, /arista_eos/
# In the broadest sense: RPM-based, fedora-derived distributions which are not strictly re-compiled RHEL (if it uses RPMs, and smells more like redhat and less like
Expand All @@ -167,7 +167,7 @@ def platform_family_from_platform(plat)
"gentoo"
when /slackware/
"slackware"
when /arch/, /manjaro/
when /arch/, /manjaro/, /antergos/
"arch"
when /exherbo/
"exherbo"
Expand Down
14 changes: 7 additions & 7 deletions spec/unit/plugins/linux/platform_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -175,32 +175,32 @@
end
end

%w{suse sles opensuse}.each do |p|
it "returns suse for #{p} platform" do
%w{suse sles opensuse opensuseleap}.each do |p|
it "returns suse for #{p} platform_family" do
expect(plugin.platform_family_from_platform(p)).to eq("suse")
end
end

%w{fedora pidora arista_eos}.each do |p|
it "returns fedora for #{p} platform" do
it "returns fedora for #{p} platform_family" do
expect(plugin.platform_family_from_platform(p)).to eq("fedora")
end
end

%w{nexus ios_xr}.each do |p|
it "returns wrlinux for #{p} platform" do
it "returns wrlinux for #{p} platform_family" do
expect(plugin.platform_family_from_platform(p)).to eq("wrlinux")
end
end

%w{arch manjaro}.each do |p|
it "returns arch for #{p} platform" do
%w{arch manjaro antergos}.each do |p|
it "returns arch for #{p} platform_family" do
expect(plugin.platform_family_from_platform(p)).to eq("arch")
end
end

%w{amazon slackware gentoo exherbo alpine clearlinux}.each do |same_name|
it "returns #{same_name} for #{same_name} platform" do
it "returns #{same_name} for #{same_name} platform_family" do
expect(plugin.platform_family_from_platform(same_name)).to eq(same_name)
end
end
Expand Down

0 comments on commit 534acc4

Please sign in to comment.