From 42b92250b95a9092b7fc08dd623ec23bbffe96ce Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Apr 2020 23:57:39 +0200 Subject: [PATCH] nixos/systemd-boot: fix default boot entry selection https://github.com/systemd/systemd/commit/6cd12ebcfe459466257ea63022a32515d756e719 changed behaviour - now the "default" entry needs to identity an entry with its full name, including the ".conf". Reported-In: https://github.com/NixOS/nixpkgs/issues/86422 --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 788b2014ced..d8baed65c6d 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 @@ -47,9 +47,9 @@ def write_loader_conf(profile, generation): if "@timeout@" != "": f.write("timeout @timeout@\n") if profile: - f.write("default nixos-%s-generation-%d\n" % (profile, generation)) + f.write("default nixos-%s-generation-%d.conf\n".format(profile, generation)) else: - f.write("default nixos-generation-%d\n" % (generation)) + f.write("default nixos-generation-%d.conf\n".format(generation)) if not @editor@: f.write("editor 0\n"); f.write("console-mode @consoleMode@\n");