From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 6 Mar 2018 18:38:43 +0000 (-0800)
Subject: GOS Table: The official Amazon Linux 2 string is "amazonlinux2-64"
X-Git-Tag: stable-10.3.0~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87ddd2684bff33836db5667718449f42642c76e2;p=thirdparty%2Fopen-vm-tools.git

GOS Table: The official Amazon Linux 2 string is "amazonlinux2-64"

The hosted UI isn't creating an Amazon 2 VM with the correct guest OS
identifier string. Fix this.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index b85e9ca59..46b363985 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -187,7 +187,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALL4XLINUX64          BS(OTHER4XLINUX_64), BS(PHOTON_64), \
                               BS(CENTOS8_64), BS(ORACLE8_64), \
-                              BS(AMAZON2_64)
+                              BS(AMAZONLINUX2_64)
 
 #define ALLVMKERNEL           BS(VMKERNEL), BS(VMKERNEL5), BS(VMKERNEL6), \
                               BS(VMKERNEL65)
@@ -225,7 +225,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_ESX_65              "VMware ESXi 6.5"
 
 /* Linux */
-#define STR_OS_AMAZON              "amazonlinux"
+#define STR_OS_AMAZON_LINUX        "amazonlinux"
 #define STR_OS_ANNVIX              "Annvix"
 #define STR_OS_ARCH                "Arch"
 #define STR_OS_ARKLINUX            "Arklinux"
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index f1e85a1f7..471886081 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -122,12 +122,12 @@ extern "C" {
    GOT(GUEST_OS_CENTOS6_64)                                                \
    GOT(GUEST_OS_CENTOS7_64)                                                \
    GOT(GUEST_OS_CENTOS8_64)                                                \
-   GOT(GUEST_OS_AMAZON2_64)
+   GOT(GUEST_OS_AMAZONLINUX2_64)
 
 
 /* This list must be sorted alphabetically (non-case-sensitive) by gos name. */
 #define GUEST_OS_LIST_GEN                                                                             \
-   GOSL(STR_OS_AMAZON "2-64",                GUEST_OS_AMAZON2_64,             NULL)                   \
+   GOSL(STR_OS_AMAZON_LINUX "2-64",          GUEST_OS_AMAZONLINUX2_64,        NULL)                   \
    GOSL(STR_OS_ASIANUX "3",                  GUEST_OS_OTHER26XLINUX,          "linuxPreGlibc25.iso")  \
    GOSL(STR_OS_ASIANUX "3-64",               GUEST_OS_OTHER26XLINUX_64,       "linuxPreGlibc25.iso")  \
    GOSL(STR_OS_ASIANUX "4",                  GUEST_OS_OTHER26XLINUX,          "linuxPreGlibc25.iso")  \
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 0355a0477..066194424 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -761,7 +761,7 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
          amazonMinor = 0;
       }
 
-      Str_Sprintf(distroShort, distroShortSize, "%s%d", STR_OS_AMAZON,
+      Str_Sprintf(distroShort, distroShortSize, "%s%d", STR_OS_AMAZON_LINUX,
                   amazonMajor);
    } else if (strstr(distroLower, "annvix")) {
       Str_Strcpy(distroShort, STR_OS_ANNVIX, distroShortSize);