git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #97689 from TethysSvensson/issue-97433

nixos/systemd-boot: Temporarily ignore errors

commit56456fef75a5576c6dc3fbdd5cb801d5da041224 authorFlorian Klink <flokli@flokli.de> dateFri 11 Sep 2020, 10:53 (6 years ago) parenta4754cab32701b
1 file changed+3−1
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py+3−1
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py+3−1
@@ -200,7 +200,9 @@ def main():
200200 else:
201201 # Update bootloader to latest if needed
202202 systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1]
203− sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True)
203+ # Ideally this should use check_output as well, but as a temporary
204+ # work-around for #97433 we ignore any errors.
205+ sdboot_status = subprocess.run(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True, stdout=subprocess.PIPE).stdout
204206
205207 # See status_binaries() in systemd bootctl.c for code which generates this
206208 m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$",