From d470a407ebcdbf0da30595120f6006aa08b46ee0 Mon Sep 17 00:00:00 2001 From: Thibault Polge Date: Sun, 12 Aug 2018 14:02:44 +0200 Subject: [PATCH] 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`. --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 1dc888c58227..6016a85ea061 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -42,7 +42,7 @@ def write_loader_conf(profile, generation): else: f.write("default nixos-generation-%d\n" % (generation)) if not @editor@: - f.write("editor 0"); + f.write("editor 0\n"); f.write("console-mode @consoleMode@\n"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")