Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main: Update ostree-ext, add provisional-repair entrypoint #4510

Merged
merged 1 commit into from
Jul 21, 2023

Conversation

cgwalters
Copy link
Member

This updates us to vendor the provisional-repair code. One can now run ostree provisional-repair directly.

(Yes, it's very confusing how in rpm-ostree, we vendor the ostree-ext
source, and then install a wrapper symlink which tells the main
(C) ostree binary to call back into us... but it's how the
ostree container stuff has been working for a long time)

This updates us to vendor the provisional-repair code.  One can
now run `ostree provisional-repair` directly.

(Yes, it's very confusing how in rpm-ostree, we vendor the ostree-ext
 source, and then install a wrapper symlink which tells the main
 (C) `ostree` binary to call back into us... but it's how the
 `ostree container` stuff has been working for a long time)
@cgwalters
Copy link
Member Author

Fixed cargo fmt

Copy link
Member

@jmarrero jmarrero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jmarrero jmarrero enabled auto-merge July 21, 2023 19:32
@cgwalters
Copy link
Member Author

Hmm, looking at backporting to c9s but that's a bit painful because technically it'd require patching our vendor tarball too. Maybe it's simplest to just ship a new upstream release there?

@jmarrero
Copy link
Member

Yeah that would be simplest.

@cgwalters
Copy link
Member Author

Hmm, flaked on
misc-2: error: finalized with inhibitor lock in block mode present

That's a slightly concerning flake, will have to debug someday

@jmarrero jmarrero merged commit 41ab2f4 into coreos:main Jul 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants