From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 26 May 2020 22:32:57 +0000 (-0700)
Subject: Common source file changes not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25320e4af24664ebb6ab324db0a1cdfebf241f37;p=thirdparty%2Fopen-vm-tools.git

Common source file changes not directly applicable to open-vm-tools.

Pre-enable SUSE 16
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 0b28e35bf..e1fc3e6c0 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -291,15 +291,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_RED_HAT_FULL       "Red Hat Linux"
 #define STR_OS_SLACKWARE          "Slackware"
 #define STR_OS_SLES               "sles"
-#define STR_OS_SLES_FULL          "SUSE Linux Enterprise Server"
-#define STR_OS_SLES_10            "sles10"
-#define STR_OS_SLES_10_FULL       "SUSE Linux Enterprise Server 10"
-#define STR_OS_SLES_11            "sles11"
-#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/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 7b37f8686..bc4ee70eb 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -869,19 +869,22 @@ HostinfoGetOSShortName(const 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 15") ||
+         if (strstr(distroLower, "server 16") ||
+             strstr(distroLower, "desktop 16")) {
+            Str_Strcpy(distroShort, STR_OS_SLES "16", distroShortSize);
+         } else if (strstr(distroLower, "server 15") ||
              strstr(distroLower, "desktop 15")) {
-            Str_Strcpy(distroShort, STR_OS_SLES_15, distroShortSize);
+            Str_Strcpy(distroShort, STR_OS_SLES "15", distroShortSize);
          } else if (strstr(distroLower, "server 12") ||
                     strstr(distroLower, "server for sap applications 12") ||
                     strstr(distroLower, "desktop 12")) {
-            Str_Strcpy(distroShort, STR_OS_SLES_12, distroShortSize);
+            Str_Strcpy(distroShort, STR_OS_SLES "12", distroShortSize);
          } else if (strstr(distroLower, "server 11") ||
                     strstr(distroLower, "desktop 11")) {
-            Str_Strcpy(distroShort, STR_OS_SLES_11, distroShortSize);
+            Str_Strcpy(distroShort, STR_OS_SLES "11", distroShortSize);
          } else if (strstr(distroLower, "server 10") ||
                     strstr(distroLower, "desktop 10")) {
-            Str_Strcpy(distroShort, STR_OS_SLES_10, distroShortSize);
+            Str_Strcpy(distroShort, STR_OS_SLES "10", distroShortSize);
          } else {
             Str_Strcpy(distroShort, STR_OS_SLES, distroShortSize);
          }