CA-407115: Remove invalid arguments from memtest86+ #200
Conversation
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
liulinC
previously approved these changes
Feb 25, 2025
bootloader/grub.cfg
Outdated
|
|
||
| menuentry "memtest" { | ||
| linux /boot/memtest86+x64.efi | ||
| linux /boot/memtest86+x64.efi console=tty0 console=hvc0 |
Contributor
There was a problem hiding this comment.
These are not valid memtest86+ arguments. Wouldn't it be better to fix the parsing code to handle the case of an entry with no additional arguments?
(memtest86+ does accept console arguments but the format is slightly different according to the docs I can find.)
Contributor
Author
There was a problem hiding this comment.
I copied the args from XS9 host:/boot/efi/EFI/xenserver/grub.cfg
So we need also to remove the args from this gurb.cfg on host.
Contributor
Author
There was a problem hiding this comment.
Rasied another PR in python-libs repo.
@liulinC @rosslagerwall @GeraldEV Could you please review it?
xenserver/python-libs#153
Contributor
Author
There was a problem hiding this comment.
Use this PR to remove invalid arguments from memtest86+.
Signed-off-by: Stephen Cheng <stephen.cheng@cloud.com>
stephenchengCloud
changed the title
stephenchengCloud
force-pushed
the
private/stephenche/CA-407115
branch
from
b5b0cee to
318bd87
Compare
rosslagerwall
approved these changes
Feb 28, 2025
liulinC
approved these changes
Mar 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
xcp/bootloader.py/readGrub2 parses the kernel args for each entries in grub.cfg:
Missing args will result in an error.
Added args to make it the same as in XS9 host:/boot/efi/EFi/xenserver/grub.cfg
+++++++++++++++++++++++++++
Updated:
Removed invalid arguments from memtest86+, and raised another PR to handle the case of an entry with no additional arguments