Guest OS: Add CentOS 8, OracleLinux 8, and AsiaNux 8

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 9028c0d6d06927a42dda0d238f98e3e16a5a87ad..e3e46ccf44950f21fb78d0b74f32cbc377a6692e 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -223,12 +223,14 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_ASIANUX_4           "asianux4"
 #define STR_OS_ASIANUX_5           "asianux5"
 #define STR_OS_ASIANUX_7           "asianux7"
+#define STR_OS_ASIANUX_8           "asianux8"
 #define STR_OS_AUROX               "Aurox"
 #define STR_OS_ASIANUX             "asianux"
 #define STR_OS_BLACKCAT            "BlackCat"
 #define STR_OS_CENTOS              "centos"
 #define STR_OS_CENTOS6             "centos6"
 #define STR_OS_CENTOS7             "centos7"
+#define STR_OS_CENTOS8             "centos8"
 #define STR_OS_COBALT              "Cobalt"
 #define STR_OS_CONECTIVA           "Conectiva"
 #define STR_OS_DEBIAN              "Debian"
@@ -255,6 +257,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_NOVELL_FULL        "Novell Linux Desktop 9"
 #define STR_OS_ORACLE6            "oraclelinux6"
 #define STR_OS_ORACLE7            "oraclelinux7"
+#define STR_OS_ORACLE8            "oraclelinux8"
 #define STR_OS_ORACLE             "oraclelinux"
 #define STR_OS_OTHER              "otherlinux"
 #define STR_OS_OTHER_FULL         "Other Linux"
@@ -279,6 +282,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_SLES_11_FULL       "SUSE Linux Enterprise Server 11"
 #define STR_OS_SLES_12            "sles12"
 #define STR_OS_SLES_12_FULL       "SUSE Linux Enterprise Server 12"
+#define STR_OS_SLES_15            "sles15"
+#define STR_OS_SLES_15_FULL       "SUSE Linux Enterprise Server 15"
 #define STR_OS_SUSE               "suse"
 #define STR_OS_SUSE_FULL          "SUSE Linux"
 #define STR_OS_OPENSUSE           "opensuse"

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index e3090e4c4d1f0730c26f7fa8aff640ae1b090e69..e5d7c3864bfb9140caa50cd9fefa8b0d68bdd02c 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -110,26 +110,30 @@ extern "C" {
    GOT(GUEST_OS_ORACLE6)                                                   \
    GOT(GUEST_OS_ORACLE6_64)                                                \
    GOT(GUEST_OS_ORACLE7_64)                                                \
+   GOT(GUEST_OS_ORACLE8_64)                                                \
    GOT(GUEST_OS_CENTOS)                                                    \
    GOT(GUEST_OS_CENTOS_64)                                                 \
    GOT(GUEST_OS_CENTOS6)                                                   \
    GOT(GUEST_OS_CENTOS6_64)                                                \
    GOT(GUEST_OS_CENTOS7_64)                                                \
+   GOT(GUEST_OS_CENTOS8_64)                                                \
 
 
 /* This list must be sorted alphabetically (non-case-sensitive) by gos name. */
 #define GUEST_OS_LIST_GEN                                                                             \
-   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")  \
-   GOSL(STR_OS_ASIANUX_4 "-64",              GUEST_OS_OTHER26XLINUX_64,       "linuxPreGlibc25.iso")  \
-   GOSL(STR_OS_ASIANUX_5 "-64",              GUEST_OS_OTHER3XLINUX_64,        "linux.iso")            \
-   GOSL(STR_OS_ASIANUX_7 "-64",              GUEST_OS_OTHER3XLINUX_64,        "linux.iso")            \
+   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")  \
+   GOSL(STR_OS_ASIANUX "4-64",               GUEST_OS_OTHER26XLINUX_64,       "linuxPreGlibc25.iso")  \
+   GOSL(STR_OS_ASIANUX "5-64",               GUEST_OS_OTHER3XLINUX_64,        "linux.iso")            \
+   GOSL(STR_OS_ASIANUX "7-64",               GUEST_OS_OTHER3XLINUX_64,        "linux.iso")            \
+   GOSL(STR_OS_ASIANUX "8-64",               GUEST_OS_OTHER3XLINUX_64,        "linux.iso")            \
    GOSL(STR_OS_CENTOS,                       GUEST_OS_CENTOS,                 "linux.iso")            \
    GOSL(STR_OS_CENTOS "-64",                 GUEST_OS_CENTOS_64,              "linux.iso")            \
    GOSL(STR_OS_CENTOS "6",                   GUEST_OS_CENTOS6,                "linux.iso")            \
    GOSL(STR_OS_CENTOS "6-64",                GUEST_OS_CENTOS6_64,             "linux.iso")            \
    GOSL(STR_OS_CENTOS "7-64",                GUEST_OS_CENTOS7_64,             "linux.iso")            \
+   GOSL(STR_OS_CENTOS "8-64",                GUEST_OS_CENTOS8_64,             "linux.iso")            \
    GOSL("coreos-64",                         GUEST_OS_OTHER3XLINUX_64,        NULL)                   \
    GOSL(STR_OS_MACOS,                        GUEST_OS_DARWIN9,                "darwinPre15.iso")      \
    GOSL(STR_OS_MACOS "-64",                  GUEST_OS_DARWIN9_64,             "darwinPre15.iso")      \
@@ -188,6 +192,7 @@ extern "C" {
    GOSL(STR_OS_ORACLE "6",                   GUEST_OS_ORACLE6,                "linux.iso")            \
    GOSL(STR_OS_ORACLE "6-64",                GUEST_OS_ORACLE6_64,             "linux.iso")            \
    GOSL(STR_OS_ORACLE "7-64",                GUEST_OS_ORACLE7_64,             "linux.iso")            \
+   GOSL(STR_OS_ORACLE "8-64",                GUEST_OS_ORACLE8_64,             "linux.iso")            \
    GOSL("os2",                               GUEST_OS_OS2,                    NULL)                   \
    GOSL("os2experimental",                   GUEST_OS_OS2,                    NULL)                   \
    GOSL("other",                             GUEST_OS_OTHER,                  NULL)                   \

diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 60ec0aa9b765db61543a1d480a937bf039a88ce6..f2167078c7432ff7072676f11333a712436e3d2e 100644 (file)
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -531,7 +531,10 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
       Str_Strcpy(distroShort, STR_OS_OPENSUSE, distroShortSize);
    } else if (strstr(distroLower, "suse")) {
       if (strstr(distroLower, "enterprise")) {
-         if (strstr(distroLower, "server 12") ||
+         if (strstr(distroLower, "server 15") ||
+             strstr(distroLower, "desktop 15")) {
+            Str_Strcpy(distroShort, STR_OS_SLES_15, distroShortSize);
+         } else if (strstr(distroLower, "server 12") ||
              strstr(distroLower, "desktop 12")) {
             Str_Strcpy(distroShort, STR_OS_SLES_12, distroShortSize);
          } else if (strstr(distroLower, "server 11") ||
@@ -574,6 +577,9 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
    } else if (strstr(distroLower, "asianux server 7") ||
               strstr(distroLower, "asianux client 7")) {
       Str_Strcpy(distroShort, STR_OS_ASIANUX_7, distroShortSize);
+   } else if (strstr(distroLower, "asianux server 8") ||
+              strstr(distroLower, "asianux client 8")) {
+      Str_Strcpy(distroShort, STR_OS_ASIANUX_8, distroShortSize);
    } else if (strstr(distroLower, "aurox")) {
       Str_Strcpy(distroShort, STR_OS_AUROX, distroShortSize);
    } else if (strstr(distroLower, "black cat")) {
@@ -585,6 +591,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
          Str_Strcpy(distroShort, STR_OS_CENTOS6, distroShortSize);
       } else if (strstr(distroLower, "7.")) {
          Str_Strcpy(distroShort, STR_OS_CENTOS7, distroShortSize);
+      } else if (strstr(distroLower, "8.")) {
+         Str_Strcpy(distroShort, STR_OS_CENTOS8, distroShortSize);
       } else {
          Str_Strcpy(distroShort, STR_OS_CENTOS, distroShortSize);
       }
@@ -619,6 +627,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
          Str_Strcpy(distroShort, STR_OS_ORACLE6, distroShortSize);
       } else if (strstr(distroLower, "7.")) {
          Str_Strcpy(distroShort, STR_OS_ORACLE7, distroShortSize);
+      } else if (strstr(distroLower, "8.")) {
+         Str_Strcpy(distroShort, STR_OS_ORACLE8, distroShortSize);
       } else {
          Str_Strcpy(distroShort, STR_OS_ORACLE, distroShortSize);
       }