]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Bump 261~devel version checks to 261 main
authorJörg Behrmann <behrmann@physik.fu-berlin.de>
Tue, 11 Aug 2026 15:27:21 +0000 (17:27 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 11 Aug 2026 18:31:45 +0000 (20:31 +0200)
systemd v261 has been released for a while, so let's bump the version checks
to a properly existing version.

mkosi/__init__.py

index 6422a8a5b3ab71f401578ba9b96f772e4fb94bf9..218f42f34a6159c79d704ce12eefa7d3ad0fc64a 100644 (file)
@@ -2810,7 +2810,7 @@ def check_inputs(config: Config) -> None:
         check_systemd_tool(
             config,
             "systemd-repart",
-            version="261~devel",
+            version="261",
             reason="use El Torito options",
         )
 
@@ -3513,7 +3513,7 @@ def make_image(
     if (
         el_torito
         and el_torito_wanted
-        and systemd_tool_version("systemd-repart", sandbox=context.sandbox) >= "261~devel"
+        and systemd_tool_version("systemd-repart", sandbox=context.sandbox) >= "261"
     ):
         cmdline += ["--el-torito=yes"]
         if context.config.el_torito_system:
@@ -4408,7 +4408,7 @@ def run_shell(args: Args, config: Config) -> None:
             cmdline += ["--bind-user", getpass.getuser(), "--bind-user-group=wheel"]
 
         if args.verb == Verb.boot and config.forward_journal:
-            if systemd_tool_version("systemd-nspawn", sandbox=config.sandbox) >= "261~devel":
+            if systemd_tool_version("systemd-nspawn", sandbox=config.sandbox) >= "261":
                 cmdline += [
                     "--forward-journal", config.forward_journal,
                     "--forward-journal-max-use=1T",