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 fb15861941078da02f9b55f72174de7606373eca..d098804dc10ee1e72c22b888c571ef4e48c5b0c3 100644 (file)
--- 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 8354be3583f8e75066b66ab6733ebe26bd592cb1..77678bc79673ea428c3356a8df769684ce135ddc 100644 (file)
--- 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,