Repository navigation
Conversation
We used to set the machine tags based on a remote TUF tags file. In the most recent discussions we decided that we would instead make this more client focused. So this commit drops setting the tags from a remote resource and instead relies on something else setting them. In our case that is a confext using /etc/tags.d [1]. Without this commit the machine tags from the confext would be reset by quarry every run. This also enables `Wants=systemd-sysupdate-auto-enable.service` now so that we get the auto-enable of components/features based on machine-tags. It does not do the loop-until-things-settled, that is a bigger change and our current 2min timer will do okay but we really need this soon too. Signed-off-by: Michael Vogt <michael@amutable.com> [1] amutable-systems/amutablectl#194
The machine tags from a confext only land in /etc/machine-info during the `systemd-confext refresh`, i.e. after the update already ran. So features gated on those tags (like docker) were only picked up by the next timer run. Now we compare the tags before and after the refresh and if they changed we auto-enable and update once more. Note that not a full loop, two passes are enough for our tags use-case. Later if we would want to use systext to ship new transfer files we still need the --loop= from systemd v263+ or a manual loop here.
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
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.
Includes #86 and needs systemd/systemd#43851 to fully work but once landed we should have the full tag based install for docker and anything in the per-machine repo/base-os repo.
The machine tags from a confext only land in /etc/machine-info during
the
systemd-confext refresh, i.e. after the update already ran. Sofeatures gated on those tags (like docker) were only picked up by the
next timer run. Now we compare the tags before and after the refresh
and if they changed we auto-enable and update once more.
Note that not a full loop, two passes are enough for our tags use-case.
Later if we would want to use systext to ship new transfer files we
still need the --loop= from systemd v263+ or a manual loop here.