ostree-sysroot: make simple_write_deployment smarter

This is a follow-up to https://github.com/ostreedev/ostree/pull/1097.
We make simple_write_deployment smart enough so that it can be used for
rpm-ostree's purposes. This is mostly an upstreaming of logic that
already existed there.

Notably we correctly append NOT_DEFAULT deployments *after* the booted
deployment and we now support RETAIN_PENDING and RETAIN_ROLLBACK flags
to have more granularity on deployment pruning.

Expose these new flags on the CLI using new options (as well as expose
the previously existing NOT_DEFAULT flag as --not-as-default).

I couldn't add tests for --retain-pending because the merge deployment
is always the topmost one. Though I did check that it worked in a VM.

Closes: #1110
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon authored and Atomic Bot committed 2017-08-25 01:02:15 +00:00
1 parent d0f40a6af8
commit 9342be6e34
9 files changed
+143 -41

No files matched your search

+3
View File
@@ -253,6 +253,9 @@ _ostree_admin_deploy() {
local boolean_options="
$main_boolean_options
--retain
--retain-pending
--retain-rollback
--not-as-default
--karg-proc-cmdline
"