system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 04:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
This fixes #20820
This commit is contained in:
Victor Westerhuis 2021-11-14 16:26:03 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent a17ebc687b
commit 87c7779599
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/fundamental/bootspec-fundamental.c
View file

@ -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)

8
src/shared/bootspec.c
View file

@ -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) {};