diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c index 536bb978..a91ba322 100644 --- a/src/daemon/rpmostree-sysroot-upgrader.c +++ b/src/daemon/rpmostree-sysroot-upgrader.c @@ -1122,12 +1122,13 @@ rpmostree_sysroot_upgrader_deploy_set_kargs (RpmOstreeSysrootUpgrader *self, /* Set the attribute kargs directly, not sure whether or not to have a setter */ /* Because .. currently pretty much here is the only place that we set it */ self->kargs_strv = g_strdupv (kernel_args); - return rpmostree_sysroot_upgrader_deploy (self, cancellable, error); + return rpmostree_sysroot_upgrader_deploy (self, NULL, cancellable, error); } /** * rpmostree_sysroot_upgrader_deploy: * @self: Self + * @out_deployment: (out) (optional): return location for new deployment * @cancellable: Cancellable * @error: Error * @@ -1136,6 +1137,7 @@ rpmostree_sysroot_upgrader_deploy_set_kargs (RpmOstreeSysrootUpgrader *self, */ gboolean rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self, + OstreeDeployment **out_deployment, GCancellable *cancellable, GError **error) { @@ -1212,6 +1214,8 @@ rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self, cancellable, error)) return FALSE; + if (out_deployment) + *out_deployment = g_steal_pointer (&new_deployment); return TRUE; } diff --git a/src/daemon/rpmostree-sysroot-upgrader.h b/src/daemon/rpmostree-sysroot-upgrader.h index 9cf09d1d..b2011e4e 100644 --- a/src/daemon/rpmostree-sysroot-upgrader.h +++ b/src/daemon/rpmostree-sysroot-upgrader.h @@ -121,6 +121,7 @@ rpmostree_sysroot_upgrader_pull_repos (RpmOstreeSysrootUpgrader *self, gboolean rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self, + OstreeDeployment **out_deployment, GCancellable *cancellable, GError **error); diff --git a/src/daemon/rpmostreed-transaction-types.c b/src/daemon/rpmostreed-transaction-types.c index f881b484..d11ec92a 100644 --- a/src/daemon/rpmostreed-transaction-types.c +++ b/src/daemon/rpmostreed-transaction-types.c @@ -1130,7 +1130,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction, return TRUE; } - if (!rpmostree_sysroot_upgrader_deploy (upgrader, cancellable, error)) + if (!rpmostree_sysroot_upgrader_deploy (upgrader, NULL, cancellable, error)) return FALSE; /* Are we rebasing? May want to delete the previous ref */ @@ -1304,7 +1304,7 @@ initramfs_state_transaction_execute (RpmostreedTransaction *transaction, rpmostree_origin_set_regenerate_initramfs (origin, self->regenerate, self->args); rpmostree_sysroot_upgrader_set_origin (upgrader, origin); - if (!rpmostree_sysroot_upgrader_deploy (upgrader, cancellable, error)) + if (!rpmostree_sysroot_upgrader_deploy (upgrader, NULL, cancellable, error)) return FALSE; if (self->reboot)