allow value of GRUB_TERMINAL to be empty #2346
Merged
+11
−7
Conversation
This file contains 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
schaefi
requested changes
Aug 18, 2023
kiwi/schema/kiwi.rnc
Outdated
| @@ -37,7 +37,7 @@ vhd-tag-type = xsd:token {pattern = "[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}"} | |||
| groups-list = xsd:token {pattern = "[a-zA-Z0-9_\-\.:]+(,[a-zA-Z0-9_\-\.:]+)*"} | |||
| arch-name = xsd:token {pattern = "(x86_64|i586|i686|ix86|aarch64|arm64|armv5el|armv5tel|armv6hl|armv6l|armv7hl|armv7l|ppc|ppc64|ppc64le|s390|s390x|riscv64)(,(x86_64|i586|i686|ix86|aarch64|arm64|armv5el|armv5tel|armv6hl|armv6l|armv7hl|armv7l|ppc|ppc64|ppc64le|s390|s390x|riscv64))*"} | |||
| portnum-type = xsd:token {pattern = "(\d+|\d+/(udp|tcp))"} | |||
| grub_console = xsd:token {pattern = "(console|gfxterm|serial)( (console|gfxterm|serial))*"} | |||
| grub_console = xsd:token {pattern = "(\s*|console|gfxterm|serial)( (console|gfxterm|serial))*"} | |||
There was a problem hiding this comment.
Could we make this more explicit by providing a none console type ? Something like this
grub_console = xsd:token {pattern = "(none|console|gfxterm|serial)( (console|gfxterm|serial))*"}
It imho makes it more clear what is expected to happen with the console setting and could also be
found better in the documentation.
Talking about the docs, could you add some words about this in
doc/source/image_description/elements.rst
Thanks much
There was a problem hiding this comment.
@leifliddy any thoughts ? Thanks
There was a problem hiding this comment.
Yup, that makes perfect sense. Sorry, I was on a motorcycle trip over the last several days. I'll try and make these changes tonight.
schaefi
approved these changes
Aug 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #
#2261
Changes proposed in this pull request:
Allow value of GRUB_TERMINAL to be an empty string
(As of this moment) setting GRUB_TERMINAL to console causes garbage rendering on Apple Silicon systems. So GRUB_TERMINAL needs to contain a blank value (or not be set at all) if you want a properly rendered grub boot menu on Apple Silicon systems.