Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a4754caab79d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56456fef75a5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 10, 2020

  1. 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.
    @TethysSvensson
    TethysSvensson committed Sep 10, 2020
    Copy the full SHA
    b32701b View commit details

Commits on Sep 11, 2020

  1. Merge pull request #97689 from TethysSvensson/issue-97433 

    nixos/systemd-boot: Temporarily ignore errors
    @flokli
    flokli authored Sep 11, 2020
    Copy the full SHA
    56456fe View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
4 changes: 3 additions & 1 deletion nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View file
Original file line number Diff line number Diff line change
@@ -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+)\)$",