From 064bd8610f87c5c50d73fa8afb5332db34b1e771 Mon Sep 17 00:00:00 2001 From: rusty-snake Date: Thu, 13 Jun 2019 13:47:43 +0200 Subject: hardening & fixing --- etc/meld.profile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'etc/meld.profile') diff --git a/etc/meld.profile b/etc/meld.profile index 34b1f22de..321b92cd5 100644 --- a/etc/meld.profile +++ b/etc/meld.profile @@ -6,6 +6,13 @@ include meld.local # Persistent global definitions include globals.local +# If you want to use meld as git-mergetool (and may some other VCS integrations) you need +# to bypass firejail, you can do this by removing the symlink or call it by its absolut path +# Removing the symlink: +# sudo rm /usr/local/bin/meld +# Calling by its absolut path (example for git-mergetoll): +# git config --global mergetool.meld.cmd /usr/bin/meld + noblacklist ${HOME}/.config/git noblacklist ${HOME}/.gitconfig noblacklist ${HOME}/.git-credentials @@ -26,7 +33,8 @@ include disable-passwdmgr.inc # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-programs.inc. #include disable-programs.inc -include whitelist-var-common.inc +# Uncomment the next line (or put it into your meld.local) if you don't need to compare files in /var. +#include whitelist-var-common.inc apparmor caps.drop all -- cgit v1.2.3-70-g09d2