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 workaround for highstate rendering failure #28

Merged
merged 1 commit into from
May 11, 2021

Conversation

marmarek
Copy link
Member

@marmarek marmarek commented May 9, 2021

Unbreak salt using dirty hack, until upstream applies the proper fix.
This is executed in a DispVM, so the change is not persistent - when
upstream fix will be there, it's enough to simply drop this line.

Workaround for saltstack/salt#60003

Fixes QubesOS/qubes-issues#6580

Unbreak salt using dirty hack, until upstream applies the proper fix.
This is executed in a DispVM, so the change is not persistent - when
upstream fix will be there, it's enough to simply drop this line.

Workaround for saltstack/salt#60003

Fixes QubesOS/qubes-issues#6580
@qubesos-bot
Copy link

qubesos-bot commented May 9, 2021

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/17327#dependencies

Failed tests

New failures

Compared to: https://openqa.qubes-os.org/tests/12774#dependencies

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/12774#dependencies

@DemiMarie
Copy link
Contributor

I wonder if we should check the explicit sha512sum of the file in question, to make sure that our sed script doesn’t cause problems in the future.

@marmarek
Copy link
Member Author

I intentionally didn't do that, so I don't need to update it whenever new update without the fix appears. The change should not be that harmful even if the problem gets fixed somewhere else - it just disables some of the caching. And the pattern should be unique enough to not hit other places in the file.

@marmarek marmarek merged commit 5d3b029 into QubesOS:master May 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Salt highstate generation doesn’t work on Fedora templates
3 participants