diff options
| author | Jonathan Lebon <jlebon@redhat.com> | 2017-08-23 12:15:46 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-08-25 01:02:15 +0000 |
| commit | 9342be6e34b26891c38b671ec285bdcbc9107acd (patch) | |
| tree | 0f91f5606ecb11213356aa9424f468d672a6f8d2 /src/libostree/ostree-sysroot.h | |
| parent | d0f40a6af8fb391d5ee34ca6d4bc2abfc5b21e16 (diff) | |
| download | ostree-9342be6e34b26891c38b671ec285bdcbc9107acd.tar.gz | |
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
Diffstat (limited to 'src/libostree/ostree-sysroot.h')
| -rw-r--r-- | src/libostree/ostree-sysroot.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libostree/ostree-sysroot.h b/src/libostree/ostree-sysroot.h index 3d2446f9..f2573d6b 100644 --- a/src/libostree/ostree-sysroot.h +++ b/src/libostree/ostree-sysroot.h @@ -207,6 +207,8 @@ typedef enum { OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN = (1 << 0), OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT = (1 << 1), OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN = (1 << 2), + OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING = (1 << 3), + OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK = (1 << 4), } OstreeSysrootSimpleWriteDeploymentFlags; _OSTREE_PUBLIC |