Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #38232 - Fix GRUB2 loader commands for Debian/Ubuntu #10455

Merged
merged 1 commit into from
Feb 25, 2025
+8 −2
Merged

Fixes #38232 - Fix GRUB2 loader commands for Debian/Ubuntu #10455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ description: |
os_major = @host.operatingsystem.major.to_i
os_name = @host.operatingsystem.name

if (os_name == 'Ubuntu' && os_major > 12) || (os_name == 'Debian' && os_major > 8)
if (os_name == 'Ubuntu' && os_major > 12 && os_major < 24) || (os_name == 'Debian' && os_major > 8 && os_major < 13)
efi_suffix = 'efi'
else
efi_suffix = ''
Expand Down
8 changes: 7 additions & 1 deletion ...views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2_autoinstall.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ test_on:
# System locale
#
<%
efi_suffix = 'efi'
os_major = @host.operatingsystem.major.to_i

if (os_major > 12 && os_major < 24)
Copy link
Member

Choose a reason for hiding this comment

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

Please include an OS name check like in the other file because this will be incorrect for Debian 13.

Copy link
Author

Choose a reason for hiding this comment

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

Autoinstall is Ubuntu only, Debian is using preseed.

Copy link
Member

Choose a reason for hiding this comment

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

Ah right, so you're referring to Ubuntu 12.04. That makes a lot more sense.

efi_suffix = 'efi'
else
efi_suffix = ''
end
-%>

set default=0
Expand Down
Loading