From 3efc2de6d1c001b55daafa60f605255e31d676ea Mon Sep 17 00:00:00 2001 From: Josh Robson Chase Date: Fri, 15 Oct 2021 10:17:09 -0400 Subject: [PATCH] nixos/systemd-boot: Use the correct version string from the bootctl --version output --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 ++-- nixos/tests/systemd-boot.nix | 2 +- 2 files changed, 3 insertions(+), 3 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 aa59c08119de..05b77ff6e5a1 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 @@ -214,7 +214,7 @@ def main() -> None: subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "--no-variables", "install"]) else: # Update bootloader to latest if needed - systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] + systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2] sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) # See status_binaries() in systemd bootctl.c for code which generates this @@ -228,7 +228,7 @@ def main() -> None: # Let systemd-boot attempt an installation if a previous one wasn't found needs_install = True else: - sdboot_version = m.group(2) + sdboot_version = f'({m.group(2)})' if systemd_version != sdboot_version: print("updating systemd-boot from %s to %s" % (sdboot_version, systemd_version)) needs_install = True diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index cba62515b48a..de89f293dce8 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -84,7 +84,7 @@ in ) output = machine.succeed("/run/current-system/bin/switch-to-configuration boot") - assert "updating systemd-boot from 000.0-1-notnixos to " in output + assert "updating systemd-boot from (000.0-1-notnixos) to " in output ''; }; }