Skip to content

Commit

Permalink
fix: skip edit of files owned by system packages
Browse files Browse the repository at this point in the history
Skipping the Git system configuration on Whonix weakens the state as it
starts depending on the dotfiles, but it is the only way to not break
system updates due to Whonix security-misc package owning the same file.

Fix: #101
  • Loading branch information
ben-grande committed Oct 14, 2024
1 parent d5b4190 commit 475b81a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion salt/dotfiles
8 changes: 8 additions & 0 deletions salt/sys-git/install-client.sls
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,15 @@ include:
- user
- group

{% if not salt['file.file_exists']('/usr/share/whonix/marker') -%}
{#
Whonix's security-misc package owns /etc/gitconfig, fallback to Git dotfiles
to set this option.
#}
"{{ slsdotpath }}-install-client-allow-protocol":
cmd.run:
- name: git config --system protocol.qrexec.allow always
- runas: root
{% endif -%}

0 comments on commit 475b81a

Please sign in to comment.