From 94a944b1107cd4d08843c8e0e385b6a212fcaa74 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Tue, 8 Oct 2024 08:59:31 +0000
Subject: [PATCH] Moving entry Garden Linux

---
 CHANGELOG.md        |  2 +-
 include/osdetection | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 027b7e66..ca3f9067 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Lynis 3.1.3 (not released yet)
 
 ### Added
-- Detection of Buildroot, Fedora Linux Asahi Remix, Peppermint OS
+- Detection of Buildroot, Fedora Linux Asahi Remix, Garden Linux, Peppermint OS
 
 ### Changed
 - FILE-6398 - Only perform test if we know if Linux kernel is monolithic/modular
diff --git a/include/osdetection b/include/osdetection
index 5890cd7f..fda72333 100644
--- a/include/osdetection
+++ b/include/osdetection
@@ -289,6 +289,13 @@
                             OS_FULLNAME="Funtoo Linux"
                             OS_VERSION="Rolling release"
                         ;;
+                        "gardenlinux")
+                            LINUX_VERSION="Garden Linux"
+                            LINUX_VERSION_LIKE="Debian"
+                            OS_NAME=$(grep "^NAME=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
+                            OS_VERSION=$(grep "^GARDENLINUX_VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
+                            OS_VERSION_FULL=$(grep "^GARDENLINUX_VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
+                        ;;
                         "garuda")
                             LINUX_VERSION="Garuda"
                             OS_FULLNAME="Garuda Linux"
@@ -504,14 +511,6 @@
                             OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
                             OS_VERSION_FULL=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
                         ;;
-                        "gardenlinux")
-                            LINUX_VERSION="Garden Linux"
-                            LINUX_VERSION_LIKE="Debian"
-                            OS_NAME=$(grep "^NAME=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
-                            OS_VERSION=$(grep "^GARDENLINUX_VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
-                            OS_VERSION_FULL=$(grep "^GARDENLINUX_VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
-
-                        ;;
                         *)
                             ReportException "OS Detection" "Unknown OS found in /etc/os-release - Please create an issue on GitHub and share the contents (cat /etc/os-release): ${PROGRAM_SOURCE}"
                         ;;