CP-308428: bootloader: Add support for xen_boot entry type (+ related cleanup)#156
Merged
rosslagerwall merged 9 commits intoxenserver:masterfrom Jul 31, 2025
Merged
Conversation
When reading a GRUB2 config, parse the baud rate as an int for consistency with the other bootloader types. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
extlinux and GRUB1 are no longer used for installed systems so remove the code that handles them. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Contributor
Author
|
See related xenserver/host-installer#285 I've tested this on XS8 and XS9 (along with the installer PR). |
freddy77
reviewed
Jul 25, 2025
freddy77
reviewed
Jul 25, 2025
tboot is no longer supported so remove the code that handles it. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
GRUB2 will fail if module2 is used without a previous call to multiboot2 so raise an exception instead of pretending that it is actually a hypervisor. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Fail when parsing a menu entry that specifies an initrd without a preceding kernel since it is invalid according to GRUB2. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
rosslagerwall
force-pushed
the
private/rossla/efi
branch
from
5ca25e9 to
e427435
Compare
Contributor
Author
|
I've updated to avoid changing the existing API or adding additional arguments to |
Pull Request Test Coverage Report for Build 16600186376Details
💛 - Coveralls |
Contributor
Author
|
Note that the coverage % decreased because I removed code that was covered. Since all new/changed code is covered in this PR, it shouldn't block merging the PR. |
freddy77
reviewed
Jul 29, 2025
Contributor
yes, the percentage decreased but the lines increased |
A GRUB2 menu entry may boot different OSes using different loaders. Add a new menu entry parameter to allow specifying the entry type: 1) multiboot2 - used for booting xen.gz 2) linux - used for booting native Linux 3) xen_boot - used for booting xen.efi, newly introduced here The entry type can be specified when first creating the menu entry (defaulting to multiboot2) and it is subsequently maintained when reading/writing the config file. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
This test is broken in multiple ways. Either: 1) Execution of diff races against the named temporary file being removed when the context manager is left, resulting in no output from diff and the test "passes" (diff exits with status 2). 2) diff generates output and the call to assertRegexpMatches() fails because it was renamed in Python 3.2. Fix this by ensuring diff finishes before leaving the context manager, asserting the exact diff expected, and checking the return code. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Ignore the warning about too many positional arguments since this is part of the existing API. Clean up trailing whitespace. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
rosslagerwall
force-pushed
the
private/rossla/efi
branch
from
ca87492 to
5f3b037
Compare
freddy77
approved these changes
Jul 29, 2025
GeraldEV
approved these changes
Jul 31, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.