shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

sd-boot+bootctl: invert order of entries w/o sort-key

Browse Source 
With the changes in 20ec8f534f90c94669ac8f9a50869f22f94fd4c8, we would sort
entries with sort-key as expected (higher versions earlier, i.e. at the top of
the menu), but entries without the sort-key as before, with higher versions
later.

When we have a bunch of boot entries grouped by machine-id (or even in the
typical case of all boot entries having the same machine id), sorting by id
should generally give good results. Entries will be grouped by installation,
and then newer entries should generally be at the top of the menu.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-03-18 19:05:03 +01:00
parent 523487f713
commit 62a4b584bb
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/boot/efi/boot.c
View File

@ -1683,10 +1683,10 @@ static INTN config_entry_compare(const ConfigEntry *a, const ConfigEntry *b) {
return r;
}
/* Now order by ID (the version is likely part of the ID, thus note that this might put the oldest
* version last, not first, i.e. specifying a sort key explicitly is thus generally preferable, to
* take benefit of the explicit sorting above.) */
r = strverscmp_improved(a->id, b->id);
/* Now order by ID. The version is likely part of the ID, thus note that this will generatelly put
* the newer versions earlier. Specifying a sort key explicitly is preferable, because it gives an
* explicit sort order. */
r = -strverscmp_improved(a->id, b->id);
if (r != 0)
return r;

3
src/shared/bootspec.c
View File

@ -272,6 +272,7 @@ static int boot_entry_compare(const BootEntry *a, const BootEntry *b) {
r = CMP(!a->sort_key, !b->sort_key);
if (r != 0)
return r;
if (a->sort_key && b->sort_key) {
r = strcmp(a->sort_key, b->sort_key);
if (r != 0)
@ -286,7 +287,7 @@ static int boot_entry_compare(const BootEntry *a, const BootEntry *b) {
return r;
}
return strverscmp_improved(a->id, b->id);
return -strverscmp_improved(a->id, b->id);
}
static int boot_entries_find(

4
src/test/test-bootspec.c
View File

@ -86,9 +86,9 @@ TEST_RET(bootspec_sort) {
assert_se(streq(config.entries[2].id, "c.conf"));
/* The following ones have no sort key, hence order by version compared ids, lowest first */
assert_se(streq(config.entries[3].id, "a-5.conf"));
assert_se(streq(config.entries[3].id, "b.conf"));
assert_se(streq(config.entries[4].id, "a-10.conf"));
assert_se(streq(config.entries[5].id, "b.conf"));
assert_se(streq(config.entries[5].id, "a-5.conf"));
return 0;
}