diff options
author | Raito Bezarius <masterancpp@gmail.com> | 2024-01-04 02:40:41 +0100 |
---|---|---|
committer | Raito Bezarius <masterancpp@gmail.com> | 2024-01-04 23:11:22 +0100 |
commit | b3d998e7eae49863b09a9edb1956a521a26eeefd (patch) | |
tree | 560adf0e60b0ca5d28099b6a6606292c59ea59d8 /nixos/modules/system | |
parent | 51d4de8c5b7f89f767d6f443115ce0edd55056d0 (diff) | |
download | nixlib-b3d998e7eae49863b09a9edb1956a521a26eeefd.tar nixlib-b3d998e7eae49863b09a9edb1956a521a26eeefd.tar.gz nixlib-b3d998e7eae49863b09a9edb1956a521a26eeefd.tar.bz2 nixlib-b3d998e7eae49863b09a9edb1956a521a26eeefd.tar.lz nixlib-b3d998e7eae49863b09a9edb1956a521a26eeefd.tar.xz nixlib-b3d998e7eae49863b09a9edb1956a521a26eeefd.tar.zst nixlib-b3d998e7eae49863b09a9edb1956a521a26eeefd.zip |
boot/loader/systemd-boot: BootSpec makes `initrdSecrets` optional
A bootspec could remove the `initrdSecrets` attribute and is a perfectly valid bootspec, as can be seen in the bootspec.cue. This makes the builder not fail upon missing `initrdSecrets`.
Diffstat (limited to 'nixos/modules/system')
-rw-r--r-- | nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py | 7 |
1 files changed, 3 insertions, 4 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 e2e7ffe59dcd..6cd46f30373b 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 @@ -20,13 +20,13 @@ from dataclasses import dataclass class BootSpec: init: str initrd: str - initrdSecrets: str kernel: str kernelParams: List[str] label: str system: str toplevel: str specialisations: Dict[str, "BootSpec"] + initrdSecrets: str | None = None @@ -131,9 +131,8 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None specialisation=" (%s)" % specialisation if specialisation else "") try: - subprocess.check_call([bootspec.initrdSecrets, "@efiSysMountPoint@%s" % (initrd)]) - except FileNotFoundError: - pass + if bootspec.initrdSecrets is not None: + subprocess.check_call([bootspec.initrdSecrets, "@efiSysMountPoint@%s" % (initrd)]) except subprocess.CalledProcessError: if current: print("failed to create initrd secrets!", file=sys.stderr) |