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

Apply salt 60003 bug workaround for salt 3005 too #34

Merged
merged 2 commits into from
Sep 7, 2022

Conversation

marmarek
Copy link
Member

@marmarek marmarek commented Sep 7, 2022

Salt 3005 release includes partial fix for saltstack/salt#6003, but
unfortunately it doesn't cover one corner case. Adjust the workaround to
apply for a partially-fixed version too. This is a "backport" of a fix
submitted upstream already.

Fixes QubesOS/qubes-issues#7742

This makes it work even if the bug prevents installing template updates.

QubesOS/qubes-issues#7742
Salt 3005 release includes partial fix for saltstack/salt#6003, but
unfortunately it doesn't cover one corner case. Adjust the workaround to
apply for a partially-fixed version too. This is a "backport" of a fix
submitted upstream already.

Fixes QubesOS/qubes-issues#6003
@nathandyer
Copy link

I tested these changes on a system experiencing the issue described in #7742, and am happy to report that things once again worked as expected once those changes were applied. 🎉

@eloquence
Copy link

+1 from me as well, tested on a system with the issue present, and applying the dom0 changes alone resolved it.

@marmarek marmarek merged commit 4366a2b into QubesOS:master Sep 7, 2022
@qubesos-bot
Copy link

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.1&build=2022090713-4.1&flavor=pull-requests

Installing updates failed, skipping the report!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants