proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-16 01:06:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support to call composite prepare and cleanup using fwupdtool

Browse Source 
Two new arguments added to fwupdtool: `--prepare` and `--cleanup`

They are used only with the `install-blob` command

This makes sure that devices can get rebooted in dell-dock even if using
fwupdtool to install a single blob.

Signed-off-by: Richard Hughes <richard@hughsie.com>
This commit is contained in:
Mario Limonciello 2019-02-01 16:09:03 +00:00 committed by Richard Hughes
parent 1e07ec95b6
commit 53ce25d985
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/bash-completion/fwupdtool.in
View File

@ -23,6 +23,8 @@ _fwupdtool_opts=(
'--force' '--force'
'--show-all-devices' '--show-all-devices'
'--plugin-whitelist' '--plugin-whitelist'
'--prepare'
'--cleanup'
) )
_show_plugins() _show_plugins()

38
src/fu-tool.c
View File

@ -49,6 +49,8 @@ typedef struct {
FuEngine *engine; FuEngine *engine;
FuProgressbar *progressbar; FuProgressbar *progressbar;
gboolean no_reboot_check; gboolean no_reboot_check;
gboolean prepare_blob;
gboolean cleanup_blob;
FwupdInstallFlags flags; FwupdInstallFlags flags;
gboolean show_all_devices; gboolean show_all_devices;
/* only valid in update and downgrade */ /* only valid in update and downgrade */
@ -682,6 +684,15 @@ fu_util_install_blob (FuUtilPrivate *priv, gchar **values, GError **error)
G_CALLBACK (fu_util_update_device_changed_cb), priv); G_CALLBACK (fu_util_update_device_changed_cb), priv);
/* write bare firmware */ /* write bare firmware */
if (priv->prepare_blob) {
g_autoptr(GPtrArray) devices = NULL;
devices = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
g_ptr_array_add (devices, g_object_ref (device));
if (!fu_engine_composite_prepare (priv->engine, devices, error)) {
g_prefix_error (error, "failed to prepare composite action: ");
return FALSE;
}
}
if (!fu_engine_install_blob (priv->engine, device, if (!fu_engine_install_blob (priv->engine, device,
NULL, /* blob_cab */ NULL, /* blob_cab */
blob_fw, blob_fw,
@ -689,6 +700,26 @@ fu_util_install_blob (FuUtilPrivate *priv, gchar **values, GError **error)
priv->flags, priv->flags,
error)) error))
return FALSE; return FALSE;
if (priv->cleanup_blob) {
g_autoptr(FuDevice) device_new = NULL;
g_autoptr(GError) error_local = NULL;
/* get the possibly new device from the old ID */
device_new = fu_engine_get_device (priv->engine,
fu_device_get_id (device),
&error_local);
if (device_new == NULL) {
g_debug ("failed to find new device: %s",
error_local->message);
} else {
g_autoptr(GPtrArray) devices_new = NULL;
g_ptr_array_add (devices_new, g_steal_pointer (&device_new));
if (!fu_engine_composite_cleanup (priv->engine, devices_new, error)) {
g_prefix_error (error, "failed to cleanup composite action: ");
return FALSE;
}
}
}
fu_util_display_current_message (priv); fu_util_display_current_message (priv);
@ -1219,6 +1250,13 @@ main (int argc, char *argv[])
{ "plugin-whitelist", '\0', 0, G_OPTION_ARG_STRING_ARRAY, &plugin_glob, { "plugin-whitelist", '\0', 0, G_OPTION_ARG_STRING_ARRAY, &plugin_glob,
/* TRANSLATORS: command line option */ /* TRANSLATORS: command line option */
_("Manually whitelist specific plugins"), NULL }, _("Manually whitelist specific plugins"), NULL },
{ "prepare", '\0', 0, G_OPTION_ARG_STRING_ARRAY, &priv->prepare_blob,
/* TRANSLATORS: command line option */
_("Run the plugin composite prepare routine when using install-blob"), NULL },
{ "cleanup", '\0', 0, G_OPTION_ARG_STRING_ARRAY, &priv->cleanup_blob,
/* TRANSLATORS: command line option */
_("Run the plugin composite cleanup routine when using install-blob"), NULL },
{ NULL} { NULL}
}; };