Skip to content

sysupdate: replace the remote machine-tags setting with local tags #86

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

Open
mvo5 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sysupdate: replace the remote machine-tags setting with local tags #86

Show file tree
Hide file tree
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
8 changes: 0 additions & 8 deletions cmd/quarry-sysupdate/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ var updateCommand = withExtensionDirFlag(withQuarryUserFlag(withQuarryProxyFlag(
&xsysupdate.TransferFileExtension{
OverrideSourcePathURL: ctxQuarryProxyURL(ctx),
},
&xsysupdate.TagsExtension{
// TODO: There is no ownership model for machine tags yet, so
// as a temporary workaround we take full control of the acp.*
// and amutable.* tag namespaces. These tags always exactly
// match the set shipped by the configured repositories, and
// tags outside them are never touched.
AllowedNamespaces: []string{"acp.", "amutable."},
},
}
ctx, err := exts.DoInit(ctx)
if err != nil {
Expand Down
6 changes: 6 additions & 0 deletions contrib/systemd/quarry-sysupdate.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
Description=Quarry-Based Automatic System Update
Wants=network-online.target
After=network-online.target
# Features gated on machine tags (SuggestOnMachineTag=) become enabled only
# when `systemd-sysupdate enable-feature --feature-suggested` runs, which is
# what systemd-sysupdate-auto-enable.service does. Run it ahead of every
# update: a tag that arrives with this run's confext is picked up by the next.
Wants=systemd-sysupdate-auto-enable.service
After=systemd-sysupdate-auto-enable.service

# For containers we assume that the manager will handle updates. And we likely
# can't even access our backing block device anyway.
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@ directly, but for those who are interested:
local HTTP server as a source in transfer files.

* `quarry sysupdate update` wraps `systemd-sysupdate` and does some pre-update
and post-update steps (such as installing tags and instantiating transfer
files from the TUF repository).
and post-update steps (such as instantiating transfer files from the TUF
repository).

In most cases, you should avoid interacting with these tools -- these are
intended to be used by a `systemd-sysupdate`-managed operating system directly.
Expand Down
Loading