From 6ef460ec9d4499a8214a45dc497fd4356e5702c2 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 4 May 2026 12:16:18 +0200 Subject: [PATCH] nixos/systemd-boot-builder: write loader.conf after the entries it points at A crash between the two would leave `default ` referring to a .conf that does not exist yet. --- .../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 b8eeaf7eb393..b22d12cf28eb 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 @@ -540,8 +540,6 @@ def install_bootloader(args: argparse.Namespace) -> None: if is_default: default_entry_id = new_bootctl_id - write_loader_conf(default_entry_id) - # Garbage-collect stale kernels/initrds/entries before re-populating extra # files, so that user-supplied extraEntries (which may also live under # loader/entries and start with `nixos-`) are not removed again. @@ -549,6 +547,8 @@ def install_bootloader(args: argparse.Namespace) -> None: write_boot_files(boot_files) + write_loader_conf(default_entry_id) + remove_extra_files() run([COPY_EXTRA_FILES])