kargs: More cleanups #674
Merged
kargs: More cleanups #674
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I happened to be looking at this code for an unrelated reason. We had 3 copies of the function calling karg computation. But that can just be pushed to a much lower level, right before we tell ostree what to do. Signed-off-by: Colin Walters <walters@verbum.org>
This is in general for us right now a no-op, but is closer to technically correct. In ostree the "merge deployment" concept started out as "deployment we use for the original /etc" which *may be different* from the booted deployment. For example, when one wants to do a "factory reset", we want to start from a fresh /etc. The other important case here is when we're doing a fresh install (or into a new stateroot) there may be no merge deployment at all! It wouldn't be correct to look at `/`. We only sidestep this issue right now because the install logic bypasses this to directly gather kargs...and doesn't use the same `deploy` API as inplace updates. But we want to get closer to doing things that way. Signed-off-by: Colin Walters <walters@verbum.org>
No need for explicit types in most of these places. Signed-off-by: Colin Walters <walters@verbum.org>
cgwalters
force-pushed
the
karg-cleanup-2
branch
from
74c1e83
to
5452ae6
Compare
|
Fixed textual conflict with #675 |
jeckersb
approved these changes
Jul 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
deploy: Centralize karg computation
I happened to be looking at this code for an unrelated reason.
We had 3 copies of the function calling karg computation.
But that can just be pushed to a much lower level, right
before we tell ostree what to do.
Signed-off-by: Colin Walters walters@verbum.org
kargs: Use merge deployment
This is in general for us right now a no-op, but is closer
to technically correct. In ostree the "merge deployment"
concept started out as "deployment we use for the original /etc"
which may be different from the booted deployment. For example,
when one wants to do a "factory reset", we want to start
from a fresh /etc.
The other important case here is when we're doing a fresh
install (or into a new stateroot) there may be no merge
deployment at all! It wouldn't be correct to look at
/.We only sidestep this issue right now because the install
logic bypasses this to directly gather kargs...and doesn't
use the same
deployAPI as inplace updates. But wewant to get closer to doing things that way.
Signed-off-by: Colin Walters walters@verbum.org
kargs: Use type inference
No need for explicit types in most of these places.
Signed-off-by: Colin Walters walters@verbum.org