From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 21 Dec 2021 20:48:50 +0000 (-0800)
Subject: Changes to common source files not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0571b23fe1513c0ec83e8b57bd8e91edd5b86a3;p=thirdparty%2Fopen-vm-tools.git

Changes to common source 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 0607c8930..00537532c 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -320,7 +320,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_MANDRAKE_FULL      "Mandrake Linux"
 #define STR_OS_MANDRIVA           "mandriva"
 #define STR_OS_MKLINUX            "MkLinux"
-#define STR_OS_NOVELL             "nld9"
+#define STR_OS_NOVELL             "nld"
 #define STR_OS_NOVELL_FULL        "Novell Linux Desktop 9"
 #define STR_OS_ORACLE             "oraclelinux"
 #define STR_OS_OTHER_LINUX        "otherlinux"
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 6744a6842..ab9271744 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1178,9 +1178,9 @@ static const ShortNameSet suseEnterpriseShortNameArray[] = {
  */
 
 static const ShortNameSet suseShortNameArray[] = {
-   { "sun",           STR_OS_SUN_DESK,  HostinfoGenericSetShortName },
-   { "novell",        STR_OS_NOVELL,    HostinfoGenericSetShortName },
-   { NULL,            NULL,             NULL                        } // MUST BE LAST
+   { "sun",           STR_OS_SUN_DESK,     HostinfoGenericSetShortName },
+   { "novell",        STR_OS_NOVELL "9",   HostinfoGenericSetShortName },
+   { NULL,            NULL,                NULL                        } // MUST BE LAST
 };