bootspec: properly parse tries done/tries left from bootspec file names

This has been a long-time omission in the userspace parser of bootspec
files. Correct that.

Fixes: #16457

1 files changed, 11 insertions, 0 deletions

diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h
index 36a3489e87..7f5d496b95 100644
--- a/src/shared/bootspec.h
+++ b/src/shared/bootspec.h
@@ -39,8 +39,17 @@ typedef struct BootEntry {
         char **initrd;
         char *device_tree;
         char **device_tree_overlay;
+        unsigned tries_left;
+        unsigned tries_done;
 } BootEntry;
 
+#define BOOT_ENTRY_INIT(t)                      \
+        {                                       \
+                .type = (t),                    \
+                .tries_left = UINT_MAX,         \
+                .tries_done = UINT_MAX,         \
+        }
+
 typedef struct BootConfig {
         char *default_pattern;
         char *timeout;
@@ -116,3 +125,5 @@ int show_boot_entry(
 int show_boot_entries(
                 const BootConfig *config,
                 JsonFormatFlags json_format);
+
+int boot_filename_extract_tries(const char *fname, char **ret_stripped, unsigned *ret_tries_left, unsigned *ret_tries_done);