public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/systemd-boot: Add missing newline 

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`.
This commit is contained in:
Thibault Polge 2018-08-12 14:02:44 +02:00
parent d61de06f88
commit d470a407eb
No known key found for this signature in database
GPG Key ID: 1B1336171A0B9064
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@ -42,7 +42,7 @@ def write_loader_conf(profile, generation):
else: else:
f.write("default nixos-generation-%d\n" % (generation)) f.write("default nixos-generation-%d\n" % (generation))
if not @editor@: if not @editor@:
f.write("editor 0"); f.write("editor 0\n");
f.write("console-mode @consoleMode@\n"); f.write("console-mode @consoleMode@\n");
os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")