diff options
| author | Florian Klink <flokli@flokli.de> | 2020-04-30 23:57:39 +0200 |
|---|---|---|
| committer | Daniel Fullmer <danielrf12@gmail.com> | 2020-06-15 20:22:45 -0400 |
| commit | 42b92250b95a9092b7fc08dd623ec23bbffe96ce (patch) | |
| tree | da324e28c3ee0120f475dbecf583312cff614d60 /nixos/modules/system/boot/loader/systemd-boot | |
| parent | 5cd28326dbe955c4793bb79ba8a927f7454974c4 (diff) | |
| download | nixpkgs-42b92250b95a9092b7fc08dd623ec23bbffe96ce.tar nixpkgs-42b92250b95a9092b7fc08dd623ec23bbffe96ce.tar.gz nixpkgs-42b92250b95a9092b7fc08dd623ec23bbffe96ce.tar.bz2 nixpkgs-42b92250b95a9092b7fc08dd623ec23bbffe96ce.tar.lz nixpkgs-42b92250b95a9092b7fc08dd623ec23bbffe96ce.tar.xz nixpkgs-42b92250b95a9092b7fc08dd623ec23bbffe96ce.tar.zst nixpkgs-42b92250b95a9092b7fc08dd623ec23bbffe96ce.zip | |
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
Diffstat (limited to 'nixos/modules/system/boot/loader/systemd-boot')
| -rw-r--r-- | nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 |
1 files 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"); |