diff --git a/web/src/App.vue b/web/src/App.vue index c8d7c71..bd3f633 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) { @@ -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 08ddc68..74c2366 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", @@ -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", }, }; @@ -60,10 +59,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 20.04/22.04 LTS", + "6.2": "Ubuntu 22.04+", + "6.5": "Ubuntu 22.04+", + "6.8": "Ubuntu 24.04 LTS", }, };