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 0b28e35bf54785be1010b7917ea7aea58836c128..e1fc3e6c0aa841288d5ca3002b9a63eae2cc0197 100644 (file)
--- 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 7b37f868690324f1ec0a84e8c4e0759eff49f70c..bc4ee70eb18fa8728834811992aedaa486dddc4c 100644 (file)
--- 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);
          }