keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Bump sysroot mtime to force reload

Browse Source 
Right now, after calling `rpm-ostree finalize-deployment`, we update the
`DefaultDeployment` property so that its `finalization-locked` key is
updated. This allows update agents like zincati to correctly understand
the current state if the reboot is locking/inhibited.

The issue though is that this property is accessible through D-Bus only,
and current plans for zincati is to just use the CLI for now.
Unfortunately, the output of `status --json` doesn't correctly get
updated since the deployments array comes from the sysroot interface.

Just use the nuclear mtime bump instead to force a reload. Another
approach long term is to formalize the set of paths/attributes libostree
clients should be monitoring, though having a single API is nice too.

Closes: #1842
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2019-05-21 15:25:21 -04:00 committed by Atomic Bot
parent 461a4f792d
commit a27d1a2153
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/daemon/rpmostreed-os.c
View File

@ -978,23 +978,11 @@ out:
return TRUE;
}
static void
on_finalize_done (RpmostreedTransaction *transaction, RpmostreedOS *self)
{
g_autoptr(GError) local_error = NULL;
if (!rpmostreed_os_load_internals (self, &local_error))
{
sd_journal_print (LOG_WARNING, "Failed to reload internals: %s",
local_error->message);
}
}
static gboolean
os_handle_finalize_deployment (RPMOSTreeOS *interface,
GDBusMethodInvocation *invocation,
GVariant *arg_options)
{
RpmostreedOS *self = RPMOSTREED_OS (interface);
g_autoptr(GCancellable) cancellable = g_cancellable_new ();
glnx_unref_object RpmostreedTransaction *transaction = NULL;
g_autoptr(OstreeSysroot) sysroot = NULL;
@ -1022,9 +1010,6 @@ os_handle_finalize_deployment (RPMOSTreeOS *interface,
rpmostreed_sysroot_set_txn (rsysroot, transaction);
/* Really, we just want to refresh `DefaultDeployment`, but meh... */
g_signal_connect (transaction, "closed", G_CALLBACK (on_finalize_done), self);
out:
if (local_error != NULL)
{

5
src/daemon/rpmostreed-transaction-types.c
View File

@ -2308,6 +2308,11 @@ finalize_deployment_transaction_execute (RpmostreedTransaction *transaction,
return glnx_throw (error, "Staged deployment already unlocked");
}
/* And bump sysroot mtime so we reload... a bit awkward, though this is similar to
* libostree itself doing this for `ostree admin unlock` (and possibly an `ostree admin`
* version of `rpm-ostree finalize-deployment`). */
(void) rpmostree_syscore_bump_mtime (sysroot, NULL);
sd_journal_print (LOG_INFO, "Finalized deployment; rebooting into %s", checksum);
rpmostreed_reboot (cancellable, error);
return TRUE;