Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion web/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ function formatKernelMappedOs(osDescription, mappings) {

if (!mappedVersion) return normalized;

return `${mappedVersion} (Linux ${kernelVersion})`;
return mappedVersion;
}

function formatOs(osDescription, detectedType) {
Expand All @@ -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);
}

Expand Down
19 changes: 9 additions & 10 deletions web/src/kernelMappings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Comment on lines 41 to 45
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot apply changes based on this feedback

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented in commit dd9d3d9.

I removed the 6.12 series fallback mapping so unlisted 6.12.* kernels no longer resolve to the ambiguous Unraid OS 7.1.x-7.2.x label.

Screenshot: /tmp/os-label-ui-unraid-612.png

"6.18.28": "Unraid OS 7.3.0",
Expand All @@ -52,18 +52,17 @@ 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",
},
};

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",
Comment on lines +62 to +66
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot apply changes based on this feedback

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented in commit 54a47ed.

Changes made:

  • Parse Ubuntu release directly from osDescription when present (e.g., Ubuntu 24.04.3 LTS -> Ubuntu 24.04 LTS) to avoid incorrect kernel-only inference.
  • Updated ambiguous Ubuntu kernel fallbacks to non-single-release labels (5.15 -> Ubuntu 20.04/22.04 LTS, 6.2/6.5 -> Ubuntu 22.04+).

Screenshot: /tmp/os-label-ui.png

},
};
Loading