Merge pull request systemd#22161 from kreijack/ignore-boot-entries

yuwata · web-flow · commit edaca18739cf · 2022-01-19T14:43:10.000+09:00
bootctl: Ignore boot entries (continue systemd#22041)
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
@@ -1603,7 +1603,7 @@ static int verb_list(int argc, char *argv[], void *userdata) {
         else if (r < 0)
                 log_warning_errno(r, "Failed to determine entries reported by boot loader, ignoring: %m");
         else
-                (void) boot_entries_augment_from_loader(&config, efi_entries, false);
+                (void) boot_entries_augment_from_loader(&config, efi_entries);
 
         if (config.n_entries == 0)
                 log_info("No boot loader entries found.");
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
@@ -3008,7 +3008,7 @@ static int boot_loader_entry_exists(Manager *m, const char *id) {
 
         r = manager_read_efi_boot_loader_entries(m);
         if (r >= 0)
-                (void) boot_entries_augment_from_loader(&config, m->efi_boot_loader_entries, true);
+                (void) boot_entries_augment_from_loader(&config, m->efi_boot_loader_entries);
 
         return boot_config_has_entry(&config, id);
 }
@@ -3166,7 +3166,7 @@ static int property_get_boot_loader_entries(
 
         r = manager_read_efi_boot_loader_entries(m);
         if (r >= 0)
-                (void) boot_entries_augment_from_loader(&config, m->efi_boot_loader_entries, true);
+                (void) boot_entries_augment_from_loader(&config, m->efi_boot_loader_entries);
 
         r = sd_bus_message_open_container(reply, 'a', "s");
         if (r < 0)
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
@@ -759,8 +759,7 @@ int boot_entries_load_config_auto(
 
 int boot_entries_augment_from_loader(
                 BootConfig *config,
-                char **found_by_loader,
-                bool only_auto) {
+                char **found_by_loader) {
 
         static const char *const title_table[] = {
                 /* Pretty names for a few well-known automatically discovered entries. */
@@ -785,7 +784,12 @@ int boot_entries_augment_from_loader(
                 if (boot_config_has_entry(config, *i))
                         continue;
 
-                if (only_auto && !startswith(*i, "auto-"))
+                /*
+                 * consider the 'auto-' entries only, because the others
+                 * ones are detected scanning the 'esp' and 'xbootldr'
+                 * directories by boot_entries_load_config()
+                 */
+                if (!startswith(*i, "auto-"))
                         continue;
 
                 c = strdup(*i);
diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h
@@ -76,7 +76,7 @@ static inline BootEntry* boot_config_default_entry(BootConfig *config) {
 void boot_config_free(BootConfig *config);
 int boot_entries_load_config(const char *esp_path, const char *xbootldr_path, BootConfig *config);
 int boot_entries_load_config_auto(const char *override_esp_path, const char *override_xbootldr_path, BootConfig *config);
-int boot_entries_augment_from_loader(BootConfig *config, char **list, bool only_auto);
+int boot_entries_augment_from_loader(BootConfig *config, char **list);
 
 static inline const char* boot_entry_title(const BootEntry *entry) {
         return entry->show_title ?: entry->title ?: entry->id;
