From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 23 Mar 2018 21:57:11 +0000 (-0700)
Subject: Changes to common header files; not applicable to open-vm-tools.
X-Git-Tag: stable-10.3.0~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e3738b457eba1d9f8302fa449e9521da59f2dfd;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files; not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index dcf04ed18..dbdcb6eb6 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -219,10 +219,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
  */
 
 /* vmkernel (ESX) */
-#define STR_OS_ESX_4               "VMware ESX/ESXi 4.x"
-#define STR_OS_ESX_5               "VMware ESXi 5.x"
-#define STR_OS_ESX_6               "VMware ESXi 6.0"
-#define STR_OS_ESX_65              "VMware ESXi 6.5"
+#define STR_OS_VMKERNEL            "vmkernel"
 
 /* Linux */
 #define STR_OS_AMAZON_LINUX        "amazonlinux"
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index c3f3d73b2..f94d3f16b 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -255,11 +255,11 @@ extern "C" {
    GOSL(STR_OS_UBUNTU,                       GUEST_OS_UBUNTU,                 "linux.iso")            \
    GOSL(STR_OS_UBUNTU "-64",                 GUEST_OS_OTHER26XLINUX_64,       "linux.iso")            \
    GOSL("unixware7",                         GUEST_OS_UNIXWARE7,              NULL)                   \
-   GOSL("vmkernel",                          GUEST_OS_VMKERNEL,               NULL)                   \
-   GOSL("vmkernel5",                         GUEST_OS_VMKERNEL5,              NULL)                   \
-   GOSL("vmkernel6",                         GUEST_OS_VMKERNEL6,              NULL)                   \
-   GOSL("vmkernel65",                        GUEST_OS_VMKERNEL65,             NULL)                   \
-   GOSL("vmkernel7",                         GUEST_OS_VMKERNEL7,              NULL)                   \
+   GOSL(STR_OS_VMKERNEL,                     GUEST_OS_VMKERNEL,               NULL)                   \
+   GOSL(STR_OS_VMKERNEL "5",                 GUEST_OS_VMKERNEL5,              NULL)                   \
+   GOSL(STR_OS_VMKERNEL "6",                 GUEST_OS_VMKERNEL6,              NULL)                   \
+   GOSL(STR_OS_VMKERNEL "65",                GUEST_OS_VMKERNEL65,             NULL)                   \
+   GOSL(STR_OS_VMKERNEL "7",                 GUEST_OS_VMKERNEL7,              NULL)                   \
    GOSL(STR_OS_PHOTON "-64",                 GUEST_OS_PHOTON_64,              NULL)                   \
    GOSL("whistler",                          GUEST_OS_WINXP,                  "winPreVista.iso") /* old */ \
    GOSL("win2000",                           GUEST_OS_WIN2000,                "winPreVista.iso") /* old */ \
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 2352e3046..8ba1196bf 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -635,18 +635,18 @@ HostinfoESX(struct utsname *buf)  // IN:
    char osNameFull[MAX_OS_FULLNAME_LEN];
 
    /* The most recent osName always goes here. */
-   Str_Strcpy(osName, "vmkernel7", sizeof osName);
+   Str_Strcpy(osName, STR_OS_VMKERNEL "7", sizeof osName);
 
    /* Handle any special cases */
    if ((buf->release[0] <= '4') && (buf->release[1] == '.')) {
-      Str_Strcpy(osName, "vmkernel", sizeof osName);
+      Str_Strcpy(osName, STR_OS_VMKERNEL, sizeof osName);
    } else if ((buf->release[0] == '5') && (buf->release[1] == '.')) {
-      Str_Strcpy(osName, "vmkernel5", sizeof osName);
+      Str_Strcpy(osName, STR_OS_VMKERNEL "5", sizeof osName);
    } else if ((buf->release[0] >= '6') && (buf->release[1] == '.')) {
       if (buf->release[2] < '5') {
-         Str_Strcpy(osName, "vmkernel6", sizeof osName);
+         Str_Strcpy(osName, STR_OS_VMKERNEL "6", sizeof osName);
       } else {
-         Str_Strcpy(osName, "vmkernel65", sizeof osName);
+         Str_Strcpy(osName, STR_OS_VMKERNEL "65", sizeof osName);
       }
    }