Commit ca84c463 authored Jan 16, 2023 by Thomas Watson Committed by Will Fancher Nov 12, 2023

nixos/systemd-boot: pass EFI variable flags during update too

8f2babd0 was partially reverted by mistake. Original message below

---

On some systems, EFI variables are not supported or otherwise wonky.
bootctl attempting to access them causes failures during bootloader
installations and updates. For such systems, NixOS provides the options
`boot.loader.efi.canTouchEfiVariables` and
`boot.loader.systemd-boot.graceful` which pass flags to bootctl that
change whether and how EFI variables are accessed.

Previously, these flags were only passed to bootctl during an install
operation. However, they also apply during an update operation, which
can cause the same sorts of errors. This change passes the flags during
update operations as well to prevent those errors.

Fixes https://github.com/NixOS/nixpkgs/issues/151336

parent d638da8b

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -268,7 +268,7 @@ def install_bootloader(args: argparse.Namespace) -> None:

		if installed_version < available_version:
		print("updating systemd-boot from %s to %s" % (installed_version, available_version))
		subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"])
		subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"])

		os.makedirs("@efiSysMountPoint@/efi/nixos", exist_ok=True)
		os.makedirs("@efiSysMountPoint@/loader/entries", exist_ok=True)