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

upgrader: Reset ref before fetching commit by override

Browse Source 
This is a short-term hack until we can depend on the new
`timestamp-check-from-rev` from ostree:

https://github.com/ostreedev/ostree/pull/2099

That way, we still get downgrade protection, but wrt the checked out
deployment, not the local ref.

For more information, see
https://github.com/coreos/rpm-ostree/pull/2094
https://github.com/coreos/fedora-coreos-tracker/issues/481
This commit is contained in:
Jonathan Lebon 2020-05-15 10:19:04 -04:00 committed by OpenShift Merge Robot
parent 1f5863a33f
commit b7ff1612ea
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/daemon/rpmostree-sysroot-upgrader.c
View File

@ -419,8 +419,19 @@ rpmostree_sysroot_upgrader_pull_base (RpmOstreeSysrootUpgrader *self,
/* Add the timestamp check, unless disabled. The option was added in
* libostree v2017.11 */
if (!allow_older)
g_variant_builder_add (optbuilder, "{s@v}", "timestamp-check",
g_variant_new_variant (g_variant_new_boolean (TRUE)));
{
g_variant_builder_add (optbuilder, "{s@v}", "timestamp-check",
g_variant_new_variant (g_variant_new_boolean (TRUE)));
/* XXX: Short-term hack until we switch to timestamp-check-from-rev:
* https://github.com/coreos/rpm-ostree/pull/2094. This ensures that
* timestamp-check is comparing against our deployment csum's timestamp, not
* whatever the ref is pointing to.
*/
if (override_commit &&
!ostree_repo_set_ref_immediate (self->repo, origin_remote, origin_ref,
self->base_revision, cancellable, error))
return FALSE;
}
g_variant_builder_add (optbuilder, "{s@v}", "refs",
g_variant_new_variant (g_variant_new_strv (
(const char *const *)&origin_ref, 1)));