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

Common header file change not directly 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 769190ff1..3f8744523 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -247,13 +247,13 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_ANNVIX              "Annvix"
 #define STR_OS_ARCH                "Arch"
 #define STR_OS_ARKLINUX            "Arklinux"
+#define STR_OS_ASIANUX             "asianux"
 #define STR_OS_ASIANUX_3           "asianux3"
 #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"
@@ -301,7 +301,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_OTHER_4X           "other4xlinux"
 #define STR_OS_OTHER_4X_FULL      "Other Linux 4.x"
 #define STR_OS_OTHER_5X           "other5xlinux"
-#define STR_OS_OTHER_5X_FULL      "Other Linux 5.x or later kernel"
+#define STR_OS_OTHER_5X_FULL      "Other Linux 5.x and later kernel"
 #define STR_OS_PHOTON             "vmware-photon"
 #define STR_OS_PHOTON_FULL        "VMware Photon OS"
 #define STR_OS_PLD                "PLD"