]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bootspec: show default/selected entry info in JSON output
authorLennart Poettering <lennart@poettering.net>
Thu, 5 Jan 2023 19:41:20 +0000 (20:41 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 6 Jan 2023 09:38:03 +0000 (10:38 +0100)
Fixes: #25889
src/shared/bootspec.c

index 2a47f30b8f3d9ca4aaa2e8743221be0aa28ef43f..36a9f1d8bd252d9da4821a5ef93efa35717790e1 100644 (file)
@@ -1441,7 +1441,10 @@ int show_boot_entries(const BootConfig *config, JsonFormatFlags json_format) {
                          * at once. */
                         r = json_append(&v, JSON_BUILD_OBJECT(
                                                        JSON_BUILD_PAIR_CONDITION(e->tries_left != UINT_MAX, "triesLeft", JSON_BUILD_UNSIGNED(e->tries_left)),
-                                                       JSON_BUILD_PAIR_CONDITION(e->tries_done != UINT_MAX, "triesDone", JSON_BUILD_UNSIGNED(e->tries_done))));
+                                                       JSON_BUILD_PAIR_CONDITION(e->tries_done != UINT_MAX, "triesDone", JSON_BUILD_UNSIGNED(e->tries_done)),
+                                                       JSON_BUILD_PAIR_CONDITION(config->default_entry >= 0, "isDefault", JSON_BUILD_BOOLEAN(i == (size_t) config->default_entry)),
+                                                       JSON_BUILD_PAIR_CONDITION(config->selected_entry >= 0, "isSelected", JSON_BUILD_BOOLEAN(i == (size_t) config->selected_entry))));
+
                         if (r < 0)
                                 return log_oom();