From ad1690efc4adf9fc83f6b527779c11fd465531ea Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 15 May 2026 13:43:01 +0000
Subject: [PATCH 1/3] Simplify mapped Ubuntu and Unraid OS labels

Agent-Logs-Url: https://github.com/cbulock/server-dashboard/sessions/7f52f8e1-f454-4ede-874c-6e2296eea7c8

Co-authored-by: cbulock <176519+cbulock@users.noreply.github.com>
---
 web/src/App.vue           |  2 +-
 web/src/kernelMappings.js | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/src/App.vue b/web/src/App.vue
index c8d7c71..b808f28 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -437,7 +437,7 @@ function formatKernelMappedOs(osDescription, mappings) {
 
   if (!mappedVersion) return normalized;
 
-  return `${mappedVersion} (Linux ${kernelVersion})`;
+  return mappedVersion;
 }
 
 function formatOs(osDescription, detectedType) {
diff --git a/web/src/kernelMappings.js b/web/src/kernelMappings.js
index 08ddc68..e094c22 100644
--- a/web/src/kernelMappings.js
+++ b/web/src/kernelMappings.js
@@ -16,12 +16,12 @@ export const UNRAID_KERNEL_MAPPINGS = {
     "5.10.19": "Unraid OS 6.9.0",
     "5.10.21": "Unraid OS 6.9.1",
     "5.10.28": "Unraid OS 6.9.2",
-    "5.15.40": "Unraid OS 6.10.0-6.10.1",
+    "5.15.40": "Unraid OS 6.10.x",
     "5.15.43": "Unraid OS 6.10.2",
     "5.15.46": "Unraid OS 6.10.3",
     "5.19.9": "Unraid OS 6.11.0",
     "5.19.14": "Unraid OS 6.11.1",
-    "5.19.17": "Unraid OS 6.11.2-6.11.5",
+    "5.19.17": "Unraid OS 6.11.x",
     "6.1.33": "Unraid OS 6.12.0",
     "6.1.34": "Unraid OS 6.12.1",
     "6.1.36": "Unraid OS 6.12.2",
@@ -39,8 +39,8 @@ export const UNRAID_KERNEL_MAPPINGS = {
     "6.1.126": "Unraid OS 6.12.15",
     "6.6.68": "Unraid OS 7.0.0",
     "6.6.78": "Unraid OS 7.0.1",
-    "6.12.24": "Unraid OS 7.1.0-7.1.4",
-    "6.12.54": "Unraid OS 7.2.0-7.2.4",
+    "6.12.24": "Unraid OS 7.1.x",
+    "6.12.54": "Unraid OS 7.2.x",
     "6.12.85": "Unraid OS 7.2.5",
     "6.12.87": "Unraid OS 7.2.6",
     "6.18.28": "Unraid OS 7.3.0",
@@ -60,10 +60,10 @@ export const UNRAID_KERNEL_MAPPINGS = {
 export const UBUNTU_KERNEL_MAPPINGS = {
   exact: {},
   series: {
-    "5.4": "Ubuntu 20.04 LTS kernel family",
-    "5.15": "Ubuntu 22.04 LTS / 20.04 HWE kernel family",
-    "6.2": "Ubuntu 22.04 LTS HWE kernel family",
-    "6.5": "Ubuntu 22.04 LTS HWE kernel family",
-    "6.8": "Ubuntu 24.04 LTS / 22.04 HWE kernel family",
+    "5.4": "Ubuntu 20.04 LTS",
+    "5.15": "Ubuntu 22.04 LTS",
+    "6.2": "Ubuntu 22.04 LTS",
+    "6.5": "Ubuntu 22.04 LTS",
+    "6.8": "Ubuntu 24.04 LTS",
   },
 };

From 54a47ed72526b7d5bfd7f1dba9132ce1d7eb57b1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 15 May 2026 13:55:27 +0000
Subject: [PATCH 2/3] Handle ambiguous Ubuntu kernel series mapping

Agent-Logs-Url: https://github.com/cbulock/server-dashboard/sessions/131b465d-d313-4501-b5f5-1f3d2f88f931

Co-authored-by: cbulock <176519+cbulock@users.noreply.github.com>
---
 web/src/App.vue           | 6 ++++++
 web/src/kernelMappings.js | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/web/src/App.vue b/web/src/App.vue
index b808f28..bd3f633 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -450,6 +450,12 @@ function formatOs(osDescription, detectedType) {
   }
 
   if (lowered.includes("ubuntu") || detectedType === "ubuntu") {
+    const ubuntuReleaseMatch = normalized.match(
+      /\bUbuntu\s+(\d+\.\d+)(?:\.\d+)?\s+LTS\b/i,
+    );
+    if (ubuntuReleaseMatch) {
+      return `Ubuntu ${ubuntuReleaseMatch[1]} LTS`;
+    }
     return formatKernelMappedOs(normalized, UBUNTU_KERNEL_MAPPINGS);
   }
 
diff --git a/web/src/kernelMappings.js b/web/src/kernelMappings.js
index e094c22..bcd7656 100644
--- a/web/src/kernelMappings.js
+++ b/web/src/kernelMappings.js
@@ -61,9 +61,9 @@ export const UBUNTU_KERNEL_MAPPINGS = {
   exact: {},
   series: {
     "5.4": "Ubuntu 20.04 LTS",
-    "5.15": "Ubuntu 22.04 LTS",
-    "6.2": "Ubuntu 22.04 LTS",
-    "6.5": "Ubuntu 22.04 LTS",
+    "5.15": "Ubuntu 20.04/22.04 LTS",
+    "6.2": "Ubuntu 22.04+",
+    "6.5": "Ubuntu 22.04+",
     "6.8": "Ubuntu 24.04 LTS",
   },
 };

From dd9d3d97c975e9c6243047287c53d8bce2efd858 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 15 May 2026 13:59:16 +0000
Subject: [PATCH 3/3] Remove ambiguous Unraid 6.12 series fallback

Agent-Logs-Url: https://github.com/cbulock/server-dashboard/sessions/e5d1683f-279c-405c-9d50-eab2e188369b

Co-authored-by: cbulock <176519+cbulock@users.noreply.github.com>
---
 web/src/kernelMappings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/src/kernelMappings.js b/web/src/kernelMappings.js
index bcd7656..74c2366 100644
--- a/web/src/kernelMappings.js
+++ b/web/src/kernelMappings.js
@@ -52,7 +52,6 @@ export const UNRAID_KERNEL_MAPPINGS = {
     "5.19": "Unraid OS 6.11.x",
     "6.1": "Unraid OS 6.12.x",
     "6.6": "Unraid OS 7.0.x",
-    "6.12": "Unraid OS 7.1.x-7.2.x",
     "6.18": "Unraid OS 7.3.x",
   },
 };