diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2023-10-10 10:12:41 +0200 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2023-10-10 14:49:51 +0200 |
commit | 865a2cf8c1b5038d7beee47a2f39d4e20bbe433c (patch) | |
tree | dc33ed1ae4c1632a7187c0dd7ccd31219f779a11 /nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py | |
parent | b7fbd1ffd4a82a46f853a78aef907e8b16570228 (diff) |
Revert "nixos/systemd-boot: skip EFI update to 252"
This reverts commit 80665d606ab66a82fc969a24a8d0143914683806.
Parsing the package version broke our systemd-boot builder test.
i.e. it won't be able to parse systemd-boot efi binaries coming from
ubuntu
We no longer use the faulty systemd-boot version so this code should no
longer be needed.
Diffstat (limited to 'nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py')
-rw-r--r--[-rwxr-xr-x] | nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py | 15 |
1 files changed, 4 insertions, 11 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 f883c12e3a1d..78b43c57e905 100755..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 @@ -13,7 +13,6 @@ import sys import warnings from typing import NamedTuple -from packaging import version libc = ctypes.CDLL("libc.so.6") @@ -260,18 +259,12 @@ def install_bootloader(args: argparse.Namespace) -> None: if available_match is None: raise Exception("could not determine systemd-boot version") - installed_version = version.parse(installed_match.group(1)) - available_version = version.parse(available_match.group(1)) + installed_version = installed_match.group(1) + available_version = available_match.group(1) - # systemd 252 has a regression that leaves some machines unbootable, so we skip that update. - # The fix is in 252.2 - # See https://github.com/systemd/systemd/issues/25363 and https://github.com/NixOS/nixpkgs/pull/201558#issuecomment-1348603263 if installed_version < available_version: - if version.parse('252') <= available_version < version.parse('252.2'): - print("skipping systemd-boot update to %s because of known regression" % available_version) - else: - print("updating systemd-boot from %s to %s" % (installed_version, available_version)) - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"]) + print("updating systemd-boot from %s to %s" % (installed_version, available_version)) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"]) os.makedirs("@efiSysMountPoint@/efi/nixos", exist_ok=True) os.makedirs("@efiSysMountPoint@/loader/entries", exist_ok=True) |