git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commitb32701bc5404ae37cfa01429962588b833913d7d authorTethys Svensson <freaken@freaken.dk> dateThu 10 Sep 2020, 20:10 (6 years ago) parent20e90aa
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+)\)$",