summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitzan Raz <nitz.raz@gmail.com>2019-07-19 17:34:14 +0300
committerNitzan Raz <nitz.raz@gmail.com>2019-07-19 17:48:10 +0300
commitae55917efc2b7ef0002ca4f4912d33950fb78d48 (patch)
treefcc93f17af1a3f68c3318271155401e5fdc86d8b
parentf531daf0c714a8d97ca0e11748a9ca94a345f5cc (diff)
downloadohai-ae55917efc2b7ef0002ca4f4912d33950fb78d48.tar.gz
Translating platform "archarm" to "arch"
The ARM installer for arch sets this OS identifier, however Chef doesn't recognize it (e.g. doesn't find a package provider). Since Chef handles providers by "platform" (and not by platform family), we should probably make ArchARM seem like Arch Signed-off-by: Nitzan Raz <nitz.raz@gmail.com>
-rw-r--r--lib/ohai/plugins/linux/platform.rb1
-rw-r--r--spec/unit/plugins/linux/platform_spec.rb5
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb
index cc5598fd..45f94744 100644
--- a/lib/ohai/plugins/linux/platform.rb
+++ b/lib/ohai/plugins/linux/platform.rb
@@ -32,6 +32,7 @@ Ohai.plugin(:Platform) do
"opensuse-leap" => "opensuseleap",
"xenenterprise" => "xenserver",
"cumulus-linux" => "cumulus",
+ "archarm" => "arch",
}.freeze
# @deprecated
diff --git a/spec/unit/plugins/linux/platform_spec.rb b/spec/unit/plugins/linux/platform_spec.rb
index 0fdc397b..3255192c 100644
--- a/spec/unit/plugins/linux/platform_spec.rb
+++ b/spec/unit/plugins/linux/platform_spec.rb
@@ -101,6 +101,11 @@ describe Ohai::System, "Linux plugin platform" do
expect(plugin.platform_id_remap("sles_sap")).to eq("suse")
end
+ # https://github.com/chef/os_release/blob/master/archarm
+ it "returns arch for archarm" do
+ expect(plugin.platform_id_remap("archarm")).to eq("arch")
+ end
+
# https://github.com/chef/os_release/blob/master/sles_15_0
it "returns suse for sles os-release id" do
expect(plugin.platform_id_remap("sles")).to eq("suse")