diff options
Diffstat (limited to 'community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch')
| -rw-r--r-- | community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch b/community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch index 5b4a30245cc..49609883588 100644 --- a/community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch +++ b/community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch @@ -1,43 +1,45 @@ -From cb8c4078a9e10c2cbb142d6b9a179cc83015806d Mon Sep 17 00:00:00 2001 +From 4df08f3805c4ba21584ac1613787a492b1ce42b0 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 5 Nov 2015 13:09:34 +0000 -Subject: [PATCH 01/12] lib/misc: Recognize Alpine Linux +Date: Wed, 17 Nov 2021 14:41:34 +0100 +Subject: [PATCH] lib/misc: Recognize Alpine Linux Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- open-vm-tools/lib/include/guest_os.h | 1 + - open-vm-tools/lib/misc/hostinfoPosix.c | 3 +++ - 2 files changed, 4 insertions(+) + open-vm-tools/lib/misc/hostinfoPosix.c | 2 ++ + 2 files changed, 3 insertions(+) diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h +index 5825cfa8..85f9d7a9 100644 --- a/open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h -@@ -239,6 +239,7 @@ - +@@ -295,6 +295,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); /* Linux */ + #define STR_OS_ALMA_LINUX "almaLinux" #define STR_OS_AMAZON_LINUX "amazonlinux" +#define STR_OS_ALPINE "Alpine" #define STR_OS_ANNVIX "Annvix" #define STR_OS_ARCH "Arch" #define STR_OS_ARKLINUX "Arklinux" diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c +index ab927174..3cfbaf1c 100644 --- a/open-vm-tools/lib/misc/hostinfoPosix.c +++ b/open-vm-tools/lib/misc/hostinfoPosix.c -@@ -185,6 +185,7 @@ +@@ -201,6 +201,7 @@ typedef struct { - /* KEEP SORTED! (sort -d) */ static const DistroInfo distroArray[] = { { "ALT", "/etc/altlinux-release" }, + { "Alpine", "/etc/alpine-release" }, { "Annvix", "/etc/annvix-release" }, { "Arch", "/etc/arch-release" }, { "Arklinux", "/etc/arklinux-release" }, -@@ -905,6 +906,8 @@ - Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize); - } else if (strstr(distroLower, "sun")) { - Str_Strcpy(distroShort, STR_OS_SUN_DESK, distroShortSize); -+ } else if (strstr(distroLower, "alpine")) { -+ Str_Strcpy(distroShort, STR_OS_ALPINE, distroShortSize); - } else if (strstr(distroLower, "amazon")) { - if (version < 2) { - version = 2; +@@ -1254,6 +1255,7 @@ HostinfoSetSuseShortName(const ShortNameSet *entry, // IN: + static const ShortNameSet shortNameArray[] = { + /* Long distro name Short distro name Short name set function */ + { "almalinux", STR_OS_ALMA_LINUX, HostinfoGenericSetShortName }, ++{ "alpine", STR_OS_ALPINE, HostinfoGenericSetShortName }, + { "amazon", NULL, HostinfoSetAmazonShortName }, + { "annvix", STR_OS_ANNVIX, HostinfoGenericSetShortName }, + { "arch", STR_OS_ARCH, HostinfoGenericSetShortName }, +-- +2.35.1 |