Skip to content

Commit ae3e4aa

Browse files
committed
Apply workaround for highstate rendering failure
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 (cherry picked from commit 5d3b029)
1 parent 0ecabad commit ae3e4aa

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

qubes.SaltLinuxVM

+4
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,8 @@ $target_vm:
4242
host: $target_vm
4343
EOF
4444
export PATH="/usr/lib/qubes-vm-connector/ssh-wrapper:$PATH"
45+
46+
# workaround for saltstack/salt#60003
47+
sed -i -e 's/if cached_client is None:/if cached_client is None or cached_client.opts["cachedir"] != self.opts["cachedir"]:/' \
48+
/usr/lib/python3*/site-packages/salt/utils/jinja.py
4549
salt-ssh -w "$target_vm" $salt_command

0 commit comments

Comments
 (0)