From: Kruti Date: Mon, 15 Jul 2024 09:56:38 +0000 (-0700) Subject: Change to common source files not applicable to open-vm-tools. X-Git-Tag: stable-12.5.0~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e8e439e9fa4f1b196fd40251db0e948cde52ce5;p=thirdparty%2Fopen-vm-tools.git Change 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 e85d649b8..9986ecadc 100644 --- a/open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h @@ -235,7 +235,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define ALL6XLINUX64 BS(OTHER6XLINUX_64), BS(OTHER6XLINUX_ARM_64), \ BS(RHEL10_64), BS(RHEL10_ARM_64), \ - BS(ORACLE10_64), BS(PROLINUX_64) + BS(ORACLE10_64), BS(PROLINUX_64), \ + BS(PARDUS_64) #define ALL7XLINUX32 BS(OTHER7XLINUX) @@ -367,6 +368,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_OTHER_6X_FULL "Other Linux 6.x kernel" #define STR_OS_OTHER_7X "other7xlinux" #define STR_OS_OTHER_7X_FULL "Other Linux 7.x and later kernel" +#define STR_OS_PARDUS "pardus" #define STR_OS_PHOTON "vmware-photon" #define STR_OS_PHOTON_FULL "VMware Photon OS" #define STR_OS_PROLINUX "prolinux" @@ -375,7 +377,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_RED_HAT "redhat" #define STR_OS_RED_HAT_EN "rhel" #define STR_OS_RED_HAT_FULL "Red Hat Linux" -#define STR_OS_ROCKY_LINUX "rockyLinux" +#define STR_OS_ROCKY_LINUX "rockyLinux" #define STR_OS_SLACKWARE "Slackware" #define STR_OS_SLES "sles" #define STR_OS_SUSE "suse" diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h index 1f46e2f17..f6b382750 100644 --- a/open-vm-tools/lib/include/guest_os_tables.h +++ b/open-vm-tools/lib/include/guest_os_tables.h @@ -190,7 +190,8 @@ extern "C" { GOT(GUEST_OS_ROCKY_LINUX_ARM_64) \ GOT(GUEST_OS_ALMA_LINUX_64) \ GOT(GUEST_OS_ALMA_LINUX_ARM_64) \ - GOT(GUEST_OS_PROLINUX_64) + GOT(GUEST_OS_PROLINUX_64) \ + GOT(GUEST_OS_PARDUS_64) /* diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c index 9bacef186..8002c6f25 100644 --- a/open-vm-tools/lib/misc/hostinfoPosix.c +++ b/open-vm-tools/lib/misc/hostinfoPosix.c @@ -1428,6 +1428,7 @@ static const ShortNameSet shortNameArray[] = { { "mklinux", STR_OS_MKLINUX, HostinfoGenericSetShortName }, { "opensuse", STR_OS_OPENSUSE, HostinfoGenericSetShortName }, { "oracle", NULL, HostinfoSetOracleShortName }, +{ "pardus", STR_OS_PARDUS, HostinfoGenericSetShortName }, { "pld", STR_OS_PLD, HostinfoGenericSetShortName }, { "prolinux", STR_OS_PROLINUX, HostinfoGenericSetShortName }, { "rocky linux", STR_OS_ROCKY_LINUX, HostinfoGenericSetShortName },