proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-07 10:27:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not trust the Block.HintSystem boolean for ESP filtering

Browse Source 
Instead use it for preferential selection. If there is none it's okay, but if
there are 3 pick the one with the flag.

Fixes https://github.com/fwupd/fwupd/issues/2676
This commit is contained in:
Richard Hughes 2020-12-14 09:36:46 +00:00
parent f99dc76cfe
commit 9d20bf9212
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libfwupdplugin/fu-common.c
View File

@ -2437,6 +2437,7 @@ FuVolume *
fu_common_get_esp_default (GError **error) fu_common_get_esp_default (GError **error)
{ {
const gchar *path_tmp; const gchar *path_tmp;
gboolean has_internal = FALSE;
g_autoptr(GPtrArray) volumes_fstab = g_ptr_array_new (); g_autoptr(GPtrArray) volumes_fstab = g_ptr_array_new ();
g_autoptr(GPtrArray) volumes_mtab = g_ptr_array_new (); g_autoptr(GPtrArray) volumes_mtab = g_ptr_array_new ();
g_autoptr(GPtrArray) volumes_vfat = g_ptr_array_new (); g_autoptr(GPtrArray) volumes_vfat = g_ptr_array_new ();
@ -2457,13 +2458,26 @@ fu_common_get_esp_default (GError **error)
return NULL; return NULL;
} }
} }
/* only add in internal vfat partitions */
/* are there _any_ internal vfat partitions?
* remember HintSystem is just that -- a hint! */
for (guint i = 0; i < volumes->len; i++) {
FuVolume *vol = g_ptr_array_index (volumes, i);
g_autofree gchar *type = fu_volume_get_id_type (vol);
if (g_strcmp0 (type, "vfat") == 0 &&
fu_volume_is_internal (vol)) {
has_internal = TRUE;
break;
}
}
/* filter to vfat partitions */
for (guint i = 0; i < volumes->len; i++) { for (guint i = 0; i < volumes->len; i++) {
FuVolume *vol = g_ptr_array_index (volumes, i); FuVolume *vol = g_ptr_array_index (volumes, i);
g_autofree gchar *type = fu_volume_get_id_type (vol); g_autofree gchar *type = fu_volume_get_id_type (vol);
if (type == NULL) if (type == NULL)
continue; continue;
if (!fu_volume_is_internal (vol)) if (has_internal && !fu_volume_is_internal (vol))
continue; continue;
if (g_strcmp0 (type, "vfat") == 0) if (g_strcmp0 (type, "vfat") == 0)
g_ptr_array_add (volumes_vfat, vol); g_ptr_array_add (volumes_vfat, vol);