From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 17 Nov 2024 12:18:42 +0000 (+0100)
Subject: Check against 257~devel instead of 257
X-Git-Tag: v25~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43c8996de71a6da75a1d979f0624967ef8c1ec2d;p=thirdparty%2Fmkosi.git

Check against 257~devel instead of 257

Otherwise the new --secure-boot-auto-enroll= option isn't used with
devel and rc versions of systemd bootctl.
---

diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py
index e3985d598..a11e3aeb4 100644
--- a/mkosi/bootloader.py
+++ b/mkosi/bootloader.py
@@ -780,7 +780,7 @@ def install_systemd_boot(context: Context) -> None:
     bootctlver = systemd_tool_version("bootctl", sandbox=context.sandbox)
 
     if want_bootctl_auto_enroll := (
-        context.config.secure_boot and context.config.secure_boot_auto_enroll and bootctlver >= 257
+        context.config.secure_boot and context.config.secure_boot_auto_enroll and bootctlver >= "257~devel"
     ):
         cmd += ["--secure-boot-auto-enroll=yes"]
 
@@ -804,7 +804,7 @@ def install_systemd_boot(context: Context) -> None:
                 context.root / shim_second_stage_binary(context),
             )
 
-    if context.config.secure_boot and context.config.secure_boot_auto_enroll and bootctlver < 257:
+    if context.config.secure_boot and context.config.secure_boot_auto_enroll and bootctlver < "257~devel":
         assert context.config.secure_boot_key
         assert context.config.secure_boot_certificate