Skip to content

Commit

Permalink
Adds clarifying comments to the update script
Browse files Browse the repository at this point in the history
Factored in some advice received during pre-review. For now we're taking
an interative approach to automating the updates. Currently we want,
in order:

  1. All dom0 RPMs up to date
  2. All TemplateVMs up to date with packages (either RPMs or debs)

What's not yet implemented is a strategy to automatically enforce the VM
state regularly. That'll likely be a `qubesctl state.highstate` command,
but punting for now to simplify testing of this already significant
change.
  • Loading branch information
Conor Schaefer committed Oct 19, 2018
1 parent 7da6573 commit d43b057
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions dom0/securedrop-update
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ function securedrop-update-feedback() {
'$msg'"
}

# `qubesctl pkg.upgrade` will automatically update dom0 packages, as well,
# but we *first* want the freshest RPMs from dom0, *then* we'll want to
# update the VMs themselves.
securedrop-update-feedback "SecureDrop: Updating dom0 configuration..."
sudo qubes-dom0-update -y

Expand All @@ -36,4 +39,8 @@ qubesctl --templates \
--max-concurrency "$SECUREDROP_MAX_CONCURRENCY" \
pkg.upgrade refresh=true

# Here would be a good place for state.highstate, to re-apply the VM configs.
# Let's first make sure the package upgrade logic is stable, we can circle
# back to enforce the Salt configs regularly.

securedrop-update-feedback "SecureDrop: All updates complete!"

0 comments on commit d43b057

Please sign in to comment.