sysroot: Add ostree_sysroot_write_deployments_with_options() by cgwalters · Pull Request #745 · ostreedev/ostree

cgwalters · 2017-03-20T19:04:19Z

Depends: #744

More sophisticated users of libostree like rpm-ostree need control over things
like the system repository. Previously we introduced a "no cleanup" flag to
ostree_sysroot_simple_write_deployment(), but that's a high level API that
does filtering on its own.

Since rpm-ostree needs more control, let's expose the bare essentials of the
"sysroot commit" operation with an extensible options structure, where one of
the options is whether or not to do post-transaction repository operations.

rh-atomic-bot · 2017-03-20T20:30:59Z

☔ The latest upstream changes (presumably 5d413df) made this pull request unmergeable. Please resolve the merge conflicts.

rh-atomic-bot · 2017-03-21T13:52:41Z

☔ The latest upstream changes (presumably e665e51) made this pull request unmergeable. Please resolve the merge conflicts.

cgwalters · 2017-03-22T14:31:46Z

🛫 Rebased 🛬

This is prep for livefs. We need to tweak the logic from what core libostree has in `ostree_sysroot_simple_write_deployment()`, and while we could land improved logic there, I think it makes sense to carry this here until we're confident enough in the logic to make it ABI. This does depend on a [new libostree API](ostreedev/ostree#745) that allows writing deployments without doing cleanup. The `bump_mtime()` bit is also prep for livefs, carrying in this patch to avoid splitting things too much.

rh-atomic-bot · 2017-03-22T16:40:37Z

☔ The latest upstream changes (presumably 7b2370d) made this pull request unmergeable. Please resolve the merge conflicts.

This is prep for livefs. We need to tweak the logic from what core libostree has in `ostree_sysroot_simple_write_deployment()`, and while we could land improved logic there, I think it makes sense to carry this here until we're confident enough in the logic to make it ABI. This does depend on a [new libostree API](ostreedev/ostree#745) that allows writing deployments without doing cleanup. The `bump_mtime()` bit is also prep for livefs, carrying in this patch to avoid splitting things too much.

More sophisticated users of libostree like rpm-ostree need control over things like the system repository. Previously we introduced a "no cleanup" flag to `ostree_sysroot_simple_write_deployment()`, but that's a high level API that does filtering on its own. Since rpm-ostree needs more control, let's expose the bare essentials of the "sysroot commit" operation with an extensible options structure, where one of the options is whether or not to do post-transaction repository operations.

cgwalters · 2017-03-23T13:02:14Z

🛫 Rebased 🛬

jlebon

Looks good, just a few minor typo nits.

Hmm, this is cool. It almost allows us to drop the baseref generation in rpm-ostree. But we would still have to guard against e.g. ostree admin cleanup and ostree prune operations (#262).

jlebon · 2017-03-23T15:30:20Z

src/libostree/ostree-sysroot-deploy.c

 *
- * Assuming @new_deployments have already been deployed in place on
- * disk, atomically update bootloader configuration.
+ * Older verison of ostree_sysroot_write_deployments() - will perform


s/verison/version/

s/ostree_sysroot_write_deployments/ostree_sysroot_write_deployments_with_options/ ?

jlebon · 2017-03-23T15:31:57Z

src/libostree/ostree-sysroot-deploy.c

+ *
+ * Assuming @new_deployments have already been deployed in place on disk via
+ * ostree_sysroot_deploy_tree(), atomically update bootloader configuration. By
+ * default, no-post-transaction cleanup will be performed. You should invoke


s/no-/no /

Adding a comment here that I've addressed your comments on the code comments ⬇️

jlebon · 2017-03-23T18:35:10Z

@rh-atomic-bot r+ ae59f35

rh-atomic-bot · 2017-03-23T18:35:16Z

⌛ Testing commit ae59f35 with merge 61bf2bd...

More sophisticated users of libostree like rpm-ostree need control over things like the system repository. Previously we introduced a "no cleanup" flag to `ostree_sysroot_simple_write_deployment()`, but that's a high level API that does filtering on its own. Since rpm-ostree needs more control, let's expose the bare essentials of the "sysroot commit" operation with an extensible options structure, where one of the options is whether or not to do post-transaction repository operations. Closes: #745 Approved by: jlebon

rh-atomic-bot · 2017-03-23T19:09:50Z

💔 Test failed - status-atomicjenkins

cgwalters · 2017-03-23T19:25:48Z

@rh-atomic-bot retry

rh-atomic-bot · 2017-03-23T19:28:45Z

⌛ Testing commit ae59f35 with merge a5d5333...

rh-atomic-bot · 2017-03-23T19:45:31Z

☀️ Test successful - status-atomicjenkins
Approved by: jlebon
Pushing a5d5333 to master...

This is prep for livefs. We need to tweak the logic from what core libostree has in `ostree_sysroot_simple_write_deployment()`, and while we could land improved logic there, I think it makes sense to carry this here until we're confident enough in the logic to make it ABI. This does depend on a [new libostree API](ostreedev/ostree#745) that allows writing deployments without doing cleanup. The `bump_mtime()` bit is also prep for livefs, carrying in this patch to avoid splitting things too much.

This is prep for livefs. We need to tweak the logic from what core libostree has in `ostree_sysroot_simple_write_deployment()`, and while we could land improved logic there, I think it makes sense to carry this here until we're confident enough in the logic to make it ABI. This does depend on a [new libostree API](ostreedev/ostree#745) that allows writing deployments without doing cleanup. The `bump_mtime()` bit is also prep for livefs, carrying in this patch to avoid splitting things too much. Closes: #709 Approved by: jlebon

cgwalters mentioned this pull request Mar 20, 2017

Introduce ex livefs for layering newly added packages 🗱 coreos/rpm-ostree#652

Closed

4 tasks

cgwalters force-pushed the write-deployments-opts branch from fb2f00b to b000868 Compare March 20, 2017 20:58

cgwalters force-pushed the write-deployments-opts branch from b000868 to cc990d6 Compare March 22, 2017 14:31

cgwalters force-pushed the write-deployments-opts branch from cc990d6 to 92be53b Compare March 23, 2017 13:02

jlebon reviewed Mar 23, 2017

View reviewed changes

fixup! sysroot: Add ostree_sysroot_write_deployments_with_options()

ae59f35

cgwalters added the homu/approved label Mar 23, 2017

rh-atomic-bot closed this in a5d5333 Mar 23, 2017

Conversation

cgwalters commented Mar 20, 2017

Uh oh!

rh-atomic-bot commented Mar 20, 2017

Uh oh!

rh-atomic-bot commented Mar 21, 2017

Uh oh!

cgwalters commented Mar 22, 2017

Uh oh!

rh-atomic-bot commented Mar 22, 2017

Uh oh!

cgwalters commented Mar 23, 2017

Uh oh!

jlebon left a comment

Choose a reason for hiding this comment

Uh oh!

jlebon Mar 23, 2017

Choose a reason for hiding this comment

Uh oh!

jlebon Mar 23, 2017

Choose a reason for hiding this comment

Uh oh!

jlebon Mar 23, 2017

Choose a reason for hiding this comment

Uh oh!

cgwalters Mar 23, 2017

Choose a reason for hiding this comment

Uh oh!

jlebon commented Mar 23, 2017

Uh oh!

rh-atomic-bot commented Mar 23, 2017

Uh oh!

rh-atomic-bot commented Mar 23, 2017

Uh oh!

cgwalters commented Mar 23, 2017

Uh oh!

rh-atomic-bot commented Mar 23, 2017

Uh oh!

rh-atomic-bot commented Mar 23, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants