Skip to content
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.

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

Shores up update cron logic #356

Merged
merged 1 commit into from
Dec 3, 2019

Conversation

conorsch
Copy link
Contributor

@conorsch conorsch commented Dec 2, 2019

Still using bash, but pared down the qubesctl calls to what's strictly necessary. Also replaced pkg.upgrade with the Qubes-maintained "update.qubes-vm" Salt state, which intelligently handles Debian/Fedora VMs. It first applies critical patches, such as for DSA-4371-1/CVE-2019-3462, for patching apt, then ensures all packages are up to date.

Ideally we'd leverage the Admin API here, but to aid in review, let's fix the most egregious problems, and go from there.

The major reduction in run time due to these changes is that only the SDW Template VMs are updated, whereas the previous logic used --templates to update all TemplateVMs on the host system.

Closes #339.

Testing

make clone
make prep-salt
sudo qubesctl --show-output state.sls sd-dom0-files
time sudo securedrop-update

Confirm no errors, and a reasonable runtime. On my system (T480), the run took ~6m.

Still using bash, but pared down the qubesctl calls to what's strictly
necessary. Also replaced pkg.upgrade with the Qubes-maintained
"update.qubes-vm" Salt state, which intelligently handles Debian/Fedora
VMs. It first applies critical patches, such as for DSA-4371-1/CVE-2019-3462,
for patching apt, then ensures all packages are up to date.
@conorsch conorsch requested review from emkll and kushaldas December 2, 2019 23:58
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worked as suggested.

@kushaldas kushaldas merged commit 75de802 into master Dec 3, 2019
@kushaldas kushaldas deleted the 339-properly-upgrade-vm-packages-via-cron branch December 3, 2019 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fedora VMs fail to upgrade: unrecognized arguments: --dist_upgrade
2 participants