common: move machine marker file#822
Merged
baude merged 1 commit intocontainers:mainfrom May 5, 2026
Merged
Conversation
Member
Author
|
Split out from #779 because I will need to have this change inside the machine images first before I can do the overmount of /etc/containers as otherwise CI cannot pass in podman as the inside podman would still look at the old path only containers/podman#28573 |
mtrmac
reviewed
May 5, 2026
Contributor
mtrmac
left a comment
mtrmac
left a comment
There was a problem hiding this comment.
This is the first time I have heard of these marker files, so I have no opinion on whether this should happen (and I’ll trust experts); ACK to the implementation.
Move the marker file location to /etc/podman-machine. Because we want to overmount /etc/containers it means the /etc/containers/podman-machine file created by ignition gets shadowed otherwise. However because ignition runs only once we should still support machines created on 5.X so keep a fallback that checks the older file as well if the first one is not found. Also rework the logic to use sync.OnceValue and make it better unit testable. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Move the marker file location to /etc/podman-machine. Because we want to overmount /etc/containers it means the /etc/containers/podman-machine file created by ignition gets shadowed otherwise.
However because ignition runs only once we should still support machines created on 5.X so keep a fallback that checks the older file as well if the first one is not found.
Also rework the logic to use sync.OnceValue and make it better unit testable.