Skip to content

sysupdate: take the tags snapshot before the first update pass #93

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.

Sign up for GitHub

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

Merged
cyphar merged 1 commit into from
Nov 3, 2026
Merged

sysupdate: take the tags snapshot before the first update pass #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions cmd/quarry-sysupdate/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,20 @@ var updateCommand = withExtensionDirFlag(withQuarryUserFlag(withQuarryProxyFlag(
// the extension application, clean up the successfully installed
// components, and force-downgrade to the old versions.

// A refreshed confext may ship machine-tags.d(5) files, and features gated on
// those tags were evaluated against the old tags. Loop until the tags
// settle.
// TODO: The real signal to stop looping is whether the set of
// installable features stopped changing (rather than the tags), but
// there isn't a really nice way for us to detect that so we use tags
// as a proxy. In future, sysupdate will handle the loop for us (and
// thus be responsible for this detection) so this can all be removed
// then.
tags, err := hostnamed.CurrentTags(ctx, "")
if err != nil {
return fmt.Errorf("fetch machine tags before update: %w", err)
}

// Pick up tags the user set by hand, not only ones a confext ships.
if err := enableSuggested(ctx); err != nil {
return err
Expand All @@ -114,19 +128,6 @@ var updateCommand = withExtensionDirFlag(withQuarryUserFlag(withQuarryProxyFlag(
return fmt.Errorf("post-update extension cleanup: %w", err)
}

// A refreshed confext may ship tags.d(5) files, and features gated on
// those tags were evaluated against the old tags. Loop until the tags
// settle.
// TODO: The real signal to stop looping is whether the set of
// installable features stopped changing (rather than the tags), but
// there isn't a really nice way for us to detect that so we use tags
// as a proxy. In future, sysupdate will handle the loop for us (and
// thus be responsible for this detection) so this can all be removed
// then.
tags, err := hostnamed.CurrentTags(ctx, "")
if err != nil {
return fmt.Errorf("fetch machine tags before refresh: %w", err)
}
for iteration := 1; ; iteration++ {
// Do online-reload of sysexts and confexts.
slog.Info("Trigger online-reload of new components.")
Expand Down
Loading