From b32701bc5404ae37cfa01429962588b833913d7d Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Thu, 10 Sep 2020 20:10:30 +0200 Subject: nixos/systemd-boot: Temporarily ignore errors This is a temporary fix for #97433. A more proper fix has been implemented upstream in systemd/systemd#17001, however until it gets backported, we are stuck with ignoring the error. After the backport lands, this commit should be reverted. --- nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nixos/modules/system/boot') 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 97e824fe629..65c7b825f85 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 @@ -200,7 +200,9 @@ def main(): else: # Update bootloader to latest if needed systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] - sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) + # Ideally this should use check_output as well, but as a temporary + # work-around for #97433 we ignore any errors. + sdboot_status = subprocess.run(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True, stdout=subprocess.PIPE).stdout # See status_binaries() in systemd bootctl.c for code which generates this m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$", -- cgit 1.4.1