From: Kruti Date: Tue, 21 May 2024 05:58:12 +0000 (-0700) Subject: Change to common source files not applicable to open-vm-tools. X-Git-Tag: stable-12.5.0~69 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6196b065644d325d6345db2a42f8778a0fcd9751;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 28e2c6a77..29aebbbd7 100644 --- a/open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h @@ -1,5 +1,6 @@ /********************************************************* - * Copyright (C) 1998-2021, 2023 VMware, Inc. All rights reserved. + * Copyright (c) 1998-2024 Broadcom. All rights reserved. + * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -234,7 +235,7 @@ 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(ORACLE10_64), BS(PROLINUX_64) #define ALL7XLINUX32 BS(OTHER7XLINUX) @@ -363,6 +364,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_OTHER_7X_FULL "Other Linux 7.x and later kernel" #define STR_OS_PHOTON "vmware-photon" #define STR_OS_PHOTON_FULL "VMware Photon OS" +#define STR_OS_PROLINUX "prolinux" +#define STR_OS_PROLINUX_FULL "ProLinux" #define STR_OS_PLD "PLD" #define STR_OS_RED_HAT "redhat" #define STR_OS_RED_HAT_EN "rhel" diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h index 9215208d9..ed247f068 100644 --- a/open-vm-tools/lib/include/guest_os_tables.h +++ b/open-vm-tools/lib/include/guest_os_tables.h @@ -187,7 +187,8 @@ extern "C" { GOT(GUEST_OS_ROCKY_LINUX_64) \ GOT(GUEST_OS_ROCKY_LINUX_ARM_64) \ GOT(GUEST_OS_ALMA_LINUX_64) \ - GOT(GUEST_OS_ALMA_LINUX_ARM_64) + GOT(GUEST_OS_ALMA_LINUX_ARM_64) \ + GOT(GUEST_OS_PROLINUX_64) /* diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c index 0772f104e..d8609805c 100644 --- a/open-vm-tools/lib/misc/hostinfoPosix.c +++ b/open-vm-tools/lib/misc/hostinfoPosix.c @@ -1427,6 +1427,7 @@ static const ShortNameSet shortNameArray[] = { { "opensuse", STR_OS_OPENSUSE, HostinfoGenericSetShortName }, { "oracle", NULL, HostinfoSetOracleShortName }, { "pld", STR_OS_PLD, HostinfoGenericSetShortName }, +{ "prolinux", STR_OS_PROLINUX, HostinfoGenericSetShortName }, { "rocky linux", STR_OS_ROCKY_LINUX, HostinfoGenericSetShortName }, { "slackware", STR_OS_SLACKWARE, HostinfoGenericSetShortName }, { "sme server", STR_OS_SMESERVER, HostinfoGenericSetShortName },