diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2015-10-06 11:33:18 -0400 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2015-10-13 12:34:57 -0400 |
commit | 2210a79bfa10f4a29113ee78f33300cea254715b (patch) | |
tree | 4cab36c13f1c01274483de85ba4ab8ab9e27d5f6 /src/ostree/ot-admin-builtin-upgrade.c | |
parent | 39b732ffaab5b95169448c911844fcf969a288d1 (diff) | |
download | ostree-2210a79bfa10f4a29113ee78f33300cea254715b.tar.gz |
upgrade: Add --override-commit=CHECKSUM option
Adds an entry to the origin file to force the OstreeSysrootUpgrader to
pull and deploy the given checksum.
[origin]
override-commit=CHECKSUM
If the option is not given, any such entry is explicitly removed from
the origin file to ensure we upgrade to the latest available commit.
Diffstat (limited to 'src/ostree/ot-admin-builtin-upgrade.c')
-rw-r--r-- | src/ostree/ot-admin-builtin-upgrade.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c index 006914a6..90d0ce98 100644 --- a/src/ostree/ot-admin-builtin-upgrade.c +++ b/src/ostree/ot-admin-builtin-upgrade.c @@ -35,11 +35,13 @@ static gboolean opt_reboot; static gboolean opt_allow_downgrade; static char *opt_osname; +static char *opt_override_commit; static GOptionEntry options[] = { { "os", 0, 0, G_OPTION_ARG_STRING, &opt_osname, "Use a different operating system root than the current one", "OSNAME" }, { "reboot", 'r', 0, G_OPTION_ARG_NONE, &opt_reboot, "Reboot after a successful upgrade", NULL }, { "allow-downgrade", 0, 0, G_OPTION_ARG_NONE, &opt_allow_downgrade, "Permit deployment of chronologically older trees", NULL }, + { "override-commit", 0, 0, G_OPTION_ARG_STRING, &opt_override_commit, "Deploy CHECKSUM instead of the latest tree", "CHECKSUM" }, { NULL } }; @@ -52,6 +54,7 @@ ot_admin_builtin_upgrade (int argc, char **argv, GCancellable *cancellable, GErr glnx_unref_object OstreeSysrootUpgrader *upgrader = NULL; g_autoptr(GFile) deployment_path = NULL; g_autoptr(GFile) deployment_origin_path = NULL; + g_autoptr(GKeyFile) origin = NULL; GSConsole *console = NULL; gboolean in_status_line = FALSE; glnx_unref_object OstreeAsyncProgress *progress = NULL; @@ -73,6 +76,35 @@ ot_admin_builtin_upgrade (int argc, char **argv, GCancellable *cancellable, GErr if (!upgrader) goto out; + origin = ostree_sysroot_upgrader_dup_origin (upgrader); + if (origin != NULL) + { + gboolean origin_changed = FALSE; + + if (opt_override_commit != NULL) + { + /* Override the commit to pull and deploy. */ + g_key_file_set_string (origin, "origin", + "override-commit", + opt_override_commit); + origin_changed = TRUE; + } + else + { + /* Strip any override-commit from the origin file so + * we always upgrade to the latest available commit. */ + origin_changed = g_key_file_remove_key (origin, "origin", + "override-commit", NULL); + } + + if (origin_changed) + { + /* XXX GCancellable parameter is not used. */ + if (!ostree_sysroot_upgrader_set_origin (upgrader, origin, NULL, error)) + goto out; + } + } + console = gs_console_get (); if (console) { |