diff options
| author | Tim Smith <tsmith@chef.io> | 2021-02-07 15:32:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 15:32:55 -0800 |
| commit | ebdaf71dc951cc359963d4f5dcbd46fddb7d4bdf (patch) | |
| tree | e128e48ff5e194bb377fa3b2e93299354e24a2e8 | |
| parent | e7ab4537234b310f22e08d9bd677d0d0ce994d58 (diff) | |
| parent | 92aa163d2716972a72b22828e4c48665ed716c9d (diff) | |
| download | ohai-ebdaf71dc951cc359963d4f5dcbd46fddb7d4bdf.tar.gz | |
Merge pull request #1618 from chef/alibaba
| -rw-r--r-- | lib/ohai/plugins/linux/platform.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb index c5fa98c5..3966ae7a 100644 --- a/lib/ohai/plugins/linux/platform.rb +++ b/lib/ohai/plugins/linux/platform.rb @@ -112,15 +112,16 @@ Ohai.plugin(:Platform) do # ohai uses. If you're adding a new platform here and you want to change the name # you'll want to add it here and then add a spec for the platform_id_remap method { - "rhel" => "redhat", + "alinux" => "alibabalinux", "amzn" => "amazon", + "archarm" => "arch", + "cumulus-linux" => "cumulus", "ol" => "oracle", - "sles" => "suse", - "sles_sap" => "suse", "opensuse-leap" => "opensuseleap", + "rhel" => "redhat", + "sles_sap" => "suse", + "sles" => "suse", "xenenterprise" => "xenserver", - "cumulus-linux" => "cumulus", - "archarm" => "arch", }[id] || id end @@ -136,7 +137,7 @@ Ohai.plugin(:Platform) do when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/, /kali/, /pop/ # apt-get+dpkg almost certainly goes here "debian" - when /oracle/, /centos/, /redhat/, /almalinux/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID" + when /oracle/, /centos/, /redhat/, /almalinux/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/, /alibabalinux/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID" # NOTE: "rhel" should be reserved exclusively for recompiled rhel versions that are nearly perfectly compatible down to the platform_version. # The operating systems that are "rhel" should all be as compatible as rhel7 = centos7 = oracle7 = scientific7 (98%-ish core RPM version compatibility # and the version numbers MUST track the upstream). The appropriate EPEL version repo should work nearly perfectly. Some variation like the |