at 15.09-beta 46 lines 2.1 kB view raw
1From d1b753212ee5151db941de0e2b826dcf9722f2f3 Mon Sep 17 00:00:00 2001 2From: Arseniy Seroka <ars.seroka@gmail.com> 3Date: Fri, 21 Aug 2015 20:20:16 +0300 4Subject: [PATCH] [PATCH]: recognize NixOS Linux 5 6--- 7 open-vm-tools/lib/include/guest_os.h | 1 + 8 open-vm-tools/lib/misc/hostinfoPosix.c | 3 +++ 9 2 files changed, 4 insertions(+) 10 11diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h 12index 4fc9ea7..f5104fd 100644 13--- a/open-vm-tools/lib/include/guest_os.h 14+++ b/open-vm-tools/lib/include/guest_os.h 15@@ -215,6 +215,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); 16 #define STR_OS_MANDRAKE_FULL "Mandrake Linux" 17 #define STR_OS_MANDRIVA "mandriva" 18 #define STR_OS_MKLINUX "MkLinux" 19+#define STR_OS_NIXOS "NixOS" 20 #define STR_OS_NOVELL "nld9" 21 #define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" 22 #define STR_OS_ORACLE "oraclelinux" 23diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c 24index 6c13fe3..5b82983 100644 25--- a/open-vm-tools/lib/misc/hostinfoPosix.c 26+++ b/open-vm-tools/lib/misc/hostinfoPosix.c 27@@ -184,6 +184,7 @@ static const DistroInfo distroArray[] = { 28 {"Mandrake", "/etc/mandrake-release"}, 29 {"Mandriva", "/etc/mandriva-release"}, 30 {"Mandrake", "/etc/mandrakelinux-release"}, 31+ {"NixOS", "/etc/os-release"}, 32 {"TurboLinux", "/etc/turbolinux-release"}, 33 {"Fedora Core", "/etc/fedora-release"}, 34 {"Gentoo", "/etc/gentoo-release"}, 35@@ -613,6 +614,8 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name 36 Str_Strcpy(distroShort, STR_OS_MANDRIVA, distroShortSize); 37 } else if (strstr(distroLower, "mklinux")) { 38 Str_Strcpy(distroShort, STR_OS_MKLINUX, distroShortSize); 39+ } else if (strstr(distroLower, "nixos")) { 40+ Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize); 41 } else if (strstr(distroLower, "pld")) { 42 Str_Strcpy(distroShort, STR_OS_PLD, distroShortSize); 43 } else if (strstr(distroLower, "slackware")) { 44-- 452.5.0 46