nixos/systemd-boot: strip newline from machine-id #375298
Merged
+1
−1
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
github-actions
bot
added
6.topic: nixos
github-actions
bot
added
10.rebuild-darwin: 0
Mic92
reviewed
Jan 20, 2025
| @@ -277,7 +277,7 @@ def get_profiles() -> list[str]: | |||
| def install_bootloader(args: argparse.Namespace) -> None: | |||
| try: | |||
| with open("/etc/machine-id") as machine_file: | |||
| machine_id = machine_file.readlines()[0] | |||
| machine_id = machine_file.readlines()[0].strip() | |||
There was a problem hiding this comment.
Looks about right. Systemd will add a newline by default when it writes this file
and we do this:
f.write("machine-id %s\n" % machine_id)
|
@Mic92 is this PR good to go? |
|
@jmbaur have you run one of the systemd boot tests? I know the change is trivial but for bootloader script changes I am always extra careful. |
To make each line in the entry file consistent, strip the newline from the machine-id content.
jmbaur
force-pushed
the
machine-id-no-newline
branch
from
ae30255 to
3de7bcc
Compare
|
@ofborg test systemd-boot.basic |
I should've done that awhile ago, thanks! Tested locally by building |
|
cc @NixOS/systemd |
arianvp
approved these changes
Mar 24, 2025
JulienMalka
approved these changes
Mar 24, 2025
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.
To make each line in the entry file consistent, strip the newline from the machine-id content.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.