summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-06-30 19:03:48 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-06-30 19:03:48 -0700
commit8e2d0c6020d59b91d4393bdfa93e5723d83528a0 (patch)
treedf7cdee66a2d80331a956977dd52cbf531249968
parenta3058a328d1e2b7d3814e02a3c9dd0fcb1329cb1 (diff)
downloadohai-lcg/fix-cisco-linux.tar.gz
ah, platform is 'nexus' which is finelcg/fix-cisco-linux
-rw-r--r--lib/ohai/plugins/linux/platform.rb2
-rw-r--r--spec/unit/plugins/linux/platform_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb
index 75c49798..e1ce4d4c 100644
--- a/lib/ohai/plugins/linux/platform.rb
+++ b/lib/ohai/plugins/linux/platform.rb
@@ -75,7 +75,7 @@ Ohai.plugin(:Platform) do
platform_version contents.match(/(\d\.\d\.\d)/)[0]
elsif File.exist?("/etc/redhat-release")
if File.exist?('/etc/os-release') && (os_release_info = os_release_file_is_cisco? ) # check if Cisco
- platform "wind_river"
+ platform "nexus"
platform_family "fedora"
platform_version os_release_info['VERSION'] || ""
else
diff --git a/spec/unit/plugins/linux/platform_spec.rb b/spec/unit/plugins/linux/platform_spec.rb
index 80f4bc4e..62eab848 100644
--- a/spec/unit/plugins/linux/platform_spec.rb
+++ b/spec/unit/plugins/linux/platform_spec.rb
@@ -604,7 +604,7 @@ OS_RELEASE
expect(File).to receive(:read).with("/etc/os-release").and_return("ID_LIKE=wrlinux\nID=nexus\nCISCO_RELEASE_INFO=/etc/os-release")
@plugin.run
expect(@plugin[:platform]).to eq("nexus")
- expect(@plugin[:platform_family]).to eq("wrlinux")
+ expect(@plugin[:platform_family]).to eq("fedora")
end
end
end