From: Russell Bunch <rusty@4lambda.io>
Date: Tue, 18 Feb 2025 16:58:52 +0000 (-0600)
Subject: Search for underscores in `systemd-stub`
X-Git-Tag: v26~370
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52d4b69bc8635d5e5da2a9dba63eea391893ad6b;p=thirdparty%2Fmkosi.git

Search for underscores in `systemd-stub`

Building raw disk images of RHEL 9 x86-64 are failing with:
```
...‣ Unable to determine systemd-stub version, found '#### LoaderInfo: systemd-stub 252-46.el9_5.2 ####'
```

Changes the regex for `systemd-stub` to include underscores for RHEL95.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index d01baf644..aca3ef558 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1849,7 +1849,7 @@ def systemd_stub_version(context: Context, stub: Path) -> Optional[GenericVersio
 
     if not (
         version := re.match(
-            r"#### LoaderInfo: systemd-stub (?P<version>[.~^a-zA-Z0-9-+]+) ####", sdmagic_text
+            r"#### LoaderInfo: systemd-stub (?P<version>[.~^a-zA-Z0-9-+_]+) ####", sdmagic_text
         )
     ):
         die(f"Unable to determine systemd-stub version, found {sdmagic_text!r}")