Add missing \n in configuration generator for systemd-boot #44935
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
thblt
changed the title
thblt
changed the title
|
I ran some of our installer and uefi tests with |
|
@srhb Notice you also need |
|
@thblt If you're curious, I've mostly been hand-editing Also, could you please amend the commit message to fit CONTRIBUTING.md? It should be "nixos/systemd-boot: Add missing newline" or something like that. :) |
This fixes an issue where setting both `boot.loader.systemd-boot.editor` to `false` and `boot.loader.systemd-boot.consoleMode` to any value would concatenate the two configuration lines in the output, resulting in an invalid `loader.conf`.
Should be good. |
|
Thank you again! 🥇 |
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.
Motivation for this change
This adds a missing \n in the configuratin generator for systemd-boot (formerly gummiboot). Because of the missing \n, the following config bit:
would produce a file ending with:
instead of
Things done
(None yet, sorry. I have no idea how to test this, and I assume the change is straightforward enough. Just tell me if you want any of these tests done, I'll look up how :)
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)