JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/systemd-boot: Use the correct version string from the bootctl --version output

Browse Source
This commit is contained in:
Josh Robson Chase 2021-10-15 10:17:09 -04:00
parent 4ddc78818e
commit 3efc2de6d1
No known key found for this signature in database
GPG Key ID: 32A347137755554F
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@ -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

2
nixos/tests/systemd-boot.nix
View File

@ -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
'';
};
}