Skip to content

Commit

Permalink
Apply workaround for highstate rendering failure
Browse files Browse the repository at this point in the history
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
  • Loading branch information
marmarek committed May 9, 2021
1 parent 5a92c27 commit 5d3b029
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions qubes.SaltLinuxVM
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,8 @@ $target_vm:
host: $target_vm
EOF
export PATH="/usr/lib/qubes-vm-connector/ssh-wrapper:$PATH"

# workaround for saltstack/salt#60003
sed -i -e 's/if cached_client is None:/if cached_client is None or cached_client.opts["cachedir"] != self.opts["cachedir"]:/' \
/usr/lib/python3*/site-packages/salt/utils/jinja.py
salt-ssh -w "$target_vm" $salt_command

0 comments on commit 5d3b029

Please sign in to comment.