From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 19 Aug 2020 17:01:17 +0000 (-0700)
Subject: Pick up the LSB distro file for ALT Linux
X-Git-Tag: stable-11.1.5~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac2ee14cbffb605c1a2a7480297883edb8c5f029;p=thirdparty%2Fopen-vm-tools.git

Pick up the LSB distro file for ALT Linux

Improve the documentation of the Linux identification routine so others
know that nothing needs to be changed in the field.
Only VMware needs to add identification codes.

https://github.com/vmware/open-vm-tools/pull/431
---

diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
index 62e58e2d2..b982c7f6f 100644
--- a/open-vm-tools/AUTHORS
+++ b/open-vm-tools/AUTHORS
@@ -59,3 +59,5 @@ Josh Paetzel    Changes to vmmemctl.ko and vmblock.ko for FreeBSD 13.0 API chang
 Josh Paetzel    FreeBSD has removed some vnops flags that have never been used.
                 - https://github.com/vmware/open-vm-tools/pull/403
 
+Alexey Shabalin Add recognition of ALT Linux distributions
+                - https://github.com/vmware/open-vm-tools/pull/431
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 26c3efd89..7ce6dc1b3 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
  *
  * 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
@@ -184,6 +184,7 @@ typedef struct {
 
 /* KEEP SORTED! (sort -d) */
 static const DistroInfo distroArray[] = {
+   { "ALT",                "/etc/altlinux-release"      },
    { "Annvix",             "/etc/annvix-release"        },
    { "Arch",               "/etc/arch-release"          },
    { "Arklinux",           "/etc/arklinux-release"      },
@@ -804,8 +805,23 @@ HostinfoESX(struct utsname *buf)  // IN:
  *      Returns distro information based on .vmx format (distroShort).
  *
  * Return value:
- *      Overwrited the short name if we recognise the OS.
- *      Otherwise leave the short name as it is.
+ *      The default value of the "short name", upon entry to this routine, is
+ *      the officially supported identification for a generic Linux
+ *      (otherLinux).
+ *
+ *      If the distro is officially supported (by VMware)- it's recognized
+ *      the code of this routine - the "short name" will be overwritten with
+ *      the officially supported "short name" of the distro. Only VMware adds
+ *      distros and related codes to this routine.
+ *
+ *      An unsupported "short name" will be ignored by the rest of the
+ *      software stack.
+ *
+ *      If the short name is not one of the officially support ones, the
+ *      default value will be left in place.
+ *
+ *      The "long name" and detailed data will fully identify what Linux
+ *      is actually present.
  *
  * Side effects:
  *      None