From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Mon, 4 Aug 2025 23:30:18 +0000 (+0100)
Subject: stub: also pickup global .raw sysexts, like per-UKI ones
X-Git-Tag: v258-rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cd3e63014a35a0f97910eedead4d06aa9988ae9;p=thirdparty%2Fsystemd.git

stub: also pickup global .raw sysexts, like per-UKI ones

It is extremely confusing to use different filenames for different
locations, so pick up the same images for both per-UKI and global
extensions

Follow-up for 9f7e3820e9b3959fca31fb4f00fae9e3b2543b76
---

diff --git a/man/systemd-stub.xml b/man/systemd-stub.xml
index fb158619410..d098804dc10 100644
--- a/man/systemd-stub.xml
+++ b/man/systemd-stub.xml
@@ -36,6 +36,7 @@
       <member><filename><replaceable>ESP</replaceable>/.../<replaceable>foo</replaceable>.efi.extra.d/*.confext.raw</filename></member>
       <member><filename><replaceable>ESP</replaceable>/loader/addons/*.addon.efi</filename></member>
       <member><filename><replaceable>ESP</replaceable>/loader/credentials/*.cred</filename></member>
+      <member><filename><replaceable>ESP</replaceable>/loader/extensions/*.raw</filename></member>
       <member><filename><replaceable>ESP</replaceable>/loader/extensions/*.sysext.raw</filename></member>
       <member><filename><replaceable>ESP</replaceable>/loader/extensions/*.confext.raw</filename></member>
     </simplelist></para>
diff --git a/src/boot/stub.c b/src/boot/stub.c
index 8354be3583f..77678bc7967 100644
--- a/src/boot/stub.c
+++ b/src/boot/stub.c
@@ -873,8 +873,8 @@ static void generate_sidecar_initrds(
 
         if (pack_cpio(loaded_image,
                       u"\\loader\\extensions",
-                      u".sysext.raw",
-                      /* exclude_suffix= */ NULL,
+                      u".raw", /* as above */
+                      u".confext.raw",
                       ".extra/global_sysext",
                       /* dir_mode= */ 0555,
                       /* access_mode= */ 0444,