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

Honor oldstable repo config for Debian 10 Buster #722

Merged
merged 2 commits into from
Aug 27, 2021

Conversation

conorsch
Copy link
Contributor

@conorsch conorsch commented Aug 24, 2021

Status

Ready for review

Description of Changes

Unbreaks clean installs by respecting the renaming of Debian Buster apt sources to "oldstable" by upstream Debian. Additionally, cleans up some of the apt repo config to resolve some long-standing issues.

Testing

It's critical to remove the TemplateVM RPM prior to confirming resolution. That's the "dnf remove" action below. Because the template RPM will need to be re-downloaded, expect ~600MB download to dom0.

make clone && make clean
sudo dnf remove qubes-template-securedrop-workstation-buster # necessary because make clean doesn't remove TemplateVM
sudo dnf clean all
make dev

If you see no errors and the provisiong completes successfully, then the issue is resolved.

Deployment

So far, testing shows that the updater runs are not affected, so existing installs do not appear to be at risk. I don't quite understand why that is, unfortunately, other than the age of the apt lists in use.

Conor Schaefer added 2 commits August 23, 2021 11:13
It ain't always a test repo, so don't call it that.
Closes #572.
Depending on the upstream Qubes-maintained upgrade.qubes-vm logic
meant that we could not carefully control run order of critical apt
operations. We want to ensure that old packages are removed, as
historical kernel packages can prevent upgrades when disk space gets
full. We also must honor "oldstable" suite changes in Debian release
files, in order to handle the recent Bullseye release.
@conorsch conorsch marked this pull request as ready for review August 25, 2021 14:27
@conorsch conorsch added this to Ready for Review in SecureDrop Team Board Aug 25, 2021
@sssoleileraaa sssoleileraaa moved this from Ready for Review to Under Review in SecureDrop Team Board Aug 26, 2021
Copy link
Contributor

@sssoleileraaa sssoleileraaa left a comment

Choose a reason for hiding this comment

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

i see 17 errors during make dev provisioning that i am now looking into... looks like the first error just says that the qubes-template-securedrop-workstation-buster package failed to install/update during the dom0-install-securedrop-workstation-template step, so time to hunt through the logs!

@conorsch
Copy link
Contributor Author

@creviera That sounds an awful lot like the original problem reported in #721. Scroll up to the top of the provisioning output and find the first error. If any failure happens during configuration of the base template, then that error will cascade into a whole slew of errors, such as the 17 you mentioned.

@eloquence
Copy link
Member

eloquence commented Aug 26, 2021

I was able to reprovision a workstation without issues with these changes (including removal of the template), and the dom0 tests ran without errors. I am no longer able to observe the issue when running apt update in sd-small-buster-template manually, either.

The change to running the fpf-apt-repo state in the updater is significant; it looks like this will also help towards #653 since it will run autoremove on each updater run, correct?

@eloquence
Copy link
Member

Completed another run without errors (I did hit an issue with make clean due to rsyslog being masked - looks like this is both interfering with logging, which you added a card for @conorsch, and at least sometimes with cleanup as well).

@sssoleileraaa
Copy link
Contributor

Sorry, was out sick and just got back to this. I lost the

Completed another run without errors (I did hit an issue with make clean due to rsyslog being masked - looks like this is both interfering with logging, which you added a card for @conorsch, and at least sometimes with cleanup as well).

I created an issue with a workaround to capture this: #723

Second time around this worked as expected.

@sssoleileraaa sssoleileraaa merged commit aa26a1c into main Aug 27, 2021
SecureDrop Team Board automation moved this from Under Review to Done Aug 27, 2021
@sssoleileraaa sssoleileraaa deleted the 721-buster-oldstable branch August 27, 2021 23:35
@conorsch
Copy link
Contributor Author

The change to running the fpf-apt-repo state in the updater is significant; it looks like this will also help towards #653 since it will run autoremove on each updater run, correct?

Yes, that's the intention! There's also #442, which I haven't closed, pending confirmation of the new behavior on a staging setup.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
3 participants