Do not require a valid version when parsing sd-boot loader entries

This fixes #20820

(cherry picked from commit 87c7779599ade84df7934c563adb7fe550c871f7)

Gbp-Pq: Name Do-not-require-a-valid-version-when-parsing-sd-boot-loade.patch

diff --git a/src/fundamental/bootspec-fundamental.c b/src/fundamental/bootspec-fundamental.c
index 89e29f598285e81dac8233dc850c06ec96a14813..c0138926a5881a88ae9eccef292a7e22778d73e9 100644 (file)
--- a/src/fundamental/bootspec-fundamental.c
+++ b/src/fundamental/bootspec-fundamental.c
@@ -46,7 +46,7 @@ sd_bool bootspec_pick_name_version_sort_key(
         good_version = os_image_version ?: (os_version ?: (os_version_id ? : os_build_id));
         good_sort_key = os_image_id ?: os_id;
 
-        if (!good_name || !good_version)
+        if (!good_name)
                 return sd_false;
 
         if (ret_name)

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 09eb36eb56ca31c6f970fd579668fdaa933ea0c7..123db5957537610a6cf522b360d7f1e6b25f1060 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -530,9 +530,11 @@ static int boot_entry_load_unified(
         if (!tmp.sort_key)
                 return log_oom();
 
-        tmp.version = strdup(good_version);
-        if (!tmp.version)
-                return log_oom();
+        if (good_version) {
+                tmp.version = strdup(good_version);
+                if (!tmp.version)
+                        return log_oom();
+        }
 
         *ret = tmp;
         tmp = (BootEntry) {};