From a0163979615644a8cd2b0d040ec718fe9358e7ff Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan <43478602+JohnTheCoolingFan@users.noreply.github.com> Date: Sat, 8 Feb 2025 09:54:04 +0300 Subject: [PATCH] OS (Linux): combine all armbian variants (#1547) --- src/detection/os/os_linux.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c index 65e5670a5..487c651a5 100644 --- a/src/detection/os/os_linux.c +++ b/src/detection/os/os_linux.c @@ -41,10 +41,13 @@ static bool parseOsRelease(const char* fileName, FFOSResult* result) // Common logic for detecting Armbian image version FF_MAYBE_UNUSED static bool detectArmbianVersion(FFOSResult* result) { - if (ffStrbufStartsWithS(&result->prettyName, "Armbian ")) // Official Armbian release images + // Possible values `PRETTY_NAME` starts with on Armbian: + // - `Armbian` for official releases + // - `Armbian_community` for community releases + // - `Armbian_Security` for images with kali repo added + // - `Armbian-unofficial` for an unofficial image built from source, e.g. during development and testing + if (ffStrbufStartsWithS(&result->prettyName, "Armbian")) ffStrbufSetS(&result->name, "Armbian"); - else if (ffStrbufStartsWithS(&result->prettyName, "Armbian-unofficial ")) // Unofficial Armbian image built from source - ffStrbufSetS(&result->name, "Armbian (custom build)"); else return false; ffStrbufSet(&result->idLike, &result->id);