diff options
| author | Florian Klink <flokli@flokli.de> | 2020-09-11 10:53:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 10:53:07 +0200 |
| commit | 56456fef75a5576c6dc3fbdd5cb801d5da041224 (patch) | |
| tree | 169a74b4712484ab4c1b560e7708583c49791760 | |
| parent | a4754caab79dfccb19d4609c12eea60fd8185737 (diff) | |
| parent | b32701bc5404ae37cfa01429962588b833913d7d (diff) | |
| download | nixlib-56456fef75a5576c6dc3fbdd5cb801d5da041224.tar nixlib-56456fef75a5576c6dc3fbdd5cb801d5da041224.tar.gz nixlib-56456fef75a5576c6dc3fbdd5cb801d5da041224.tar.bz2 nixlib-56456fef75a5576c6dc3fbdd5cb801d5da041224.tar.lz nixlib-56456fef75a5576c6dc3fbdd5cb801d5da041224.tar.xz nixlib-56456fef75a5576c6dc3fbdd5cb801d5da041224.tar.zst nixlib-56456fef75a5576c6dc3fbdd5cb801d5da041224.zip | |
Merge pull request #97689 from TethysSvensson/issue-97433
nixos/systemd-boot: Temporarily ignore errors
| -rw-r--r-- | nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 |
1 files changed, 3 insertions, 1 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 97e824fe629c..65c7b825f855 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+)\)$", |