diff options
author | glitsj16 <glitsj16@users.noreply.github.com> | 2021-04-06 09:26:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-06 09:26:30 +0000 |
commit | 91185bbc4a8e9e8791f297bb731b23a8e80aaf9b (patch) | |
tree | 4875fd73f59fcabcb145bef7f4d55273f4fc0d46 /etc/profile-m-z/meld.profile | |
parent | Merge pull request #4161 from glitsj16/signal-desktop (diff) | |
download | firejail-91185bbc4a8e9e8791f297bb731b23a8e80aaf9b.tar.gz firejail-91185bbc4a8e9e8791f297bb731b23a8e80aaf9b.tar.zst firejail-91185bbc4a8e9e8791f297bb731b23a8e80aaf9b.zip |
Encourage making overrides in *.local files (#4165)
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
* refactor local override comments
Diffstat (limited to 'etc/profile-m-z/meld.profile')
-rw-r--r-- | etc/profile-m-z/meld.profile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/etc/profile-m-z/meld.profile b/etc/profile-m-z/meld.profile index d76522fce..900523b81 100644 --- a/etc/profile-m-z/meld.profile +++ b/etc/profile-m-z/meld.profile | |||
@@ -7,11 +7,11 @@ include meld.local | |||
7 | include globals.local | 7 | include globals.local |
8 | 8 | ||
9 | # If you want to use meld as git mergetool (and maybe some other VCS integrations) you need | 9 | # If you want to use meld as git mergetool (and maybe some other VCS integrations) you need |
10 | # to bypass firejail, you can do this by removing the symlink or calling it by its absolute path | 10 | # to bypass firejail. You can do this by removing the symlink or by calling it by its absolute path. |
11 | # Removing the symlink: | 11 | # Removing the symlink: |
12 | # sudo rm /usr/local/bin/meld | 12 | # $ sudo rm /usr/local/bin/meld |
13 | # Calling it by its absolute path (example for git mergetool): | 13 | # Calling it by its absolute path (example for git mergetool): |
14 | # git config --global mergetool.meld.cmd /usr/bin/meld | 14 | # $ git config --global mergetool.meld.cmd /usr/bin/meld |
15 | 15 | ||
16 | noblacklist ${HOME}/.config/meld | 16 | noblacklist ${HOME}/.config/meld |
17 | noblacklist ${HOME}/.config/git | 17 | noblacklist ${HOME}/.config/git |
@@ -21,30 +21,31 @@ noblacklist ${HOME}/.local/share/meld | |||
21 | noblacklist ${HOME}/.subversion | 21 | noblacklist ${HOME}/.subversion |
22 | 22 | ||
23 | # Allow python (blacklisted by disable-interpreters.inc) | 23 | # Allow python (blacklisted by disable-interpreters.inc) |
24 | # Python 2 is EOL (see #3164). Uncomment the next line (or put it into your meld.local) if you understand the risks but want python 2 support for older meld versions. | 24 | # Python 2 is EOL (see #3164). Add the next line to your meld.local if you understand the risks |
25 | # but want to keep Python 2 support for older meld versions. | ||
25 | #include allow-python2.inc | 26 | #include allow-python2.inc |
26 | include allow-python3.inc | 27 | include allow-python3.inc |
27 | 28 | ||
28 | # Allow ssh (blacklisted by disable-common.inc) | 29 | # Allow ssh (blacklisted by disable-common.inc) |
29 | include allow-ssh.inc | 30 | include allow-ssh.inc |
30 | 31 | ||
31 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. | 32 | # Add the next line to your meld.local if you don't need to compare files in disable-common.inc. |
32 | #include disable-common.inc | 33 | #include disable-common.inc |
33 | include disable-devel.inc | 34 | include disable-devel.inc |
34 | include disable-exec.inc | 35 | include disable-exec.inc |
35 | include disable-interpreters.inc | 36 | include disable-interpreters.inc |
36 | include disable-passwdmgr.inc | 37 | include disable-passwdmgr.inc |
37 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-programs.inc. | 38 | # Add the next line to your meld.local if you don't need to compare files in disable-programs.inc. |
38 | #include disable-programs.inc | 39 | #include disable-programs.inc |
39 | include disable-shell.inc | 40 | include disable-shell.inc |
40 | 41 | ||
41 | include whitelist-runuser-common.inc | 42 | include whitelist-runuser-common.inc |
42 | 43 | ||
43 | # Uncomment the next lines (or put it into your meld.local) if you don't need to compare files in /usr/share. | 44 | # Add the next lines to your meld.local if you don't need to compare files in /usr/share. |
44 | #whitelist /usr/share/meld | 45 | #whitelist /usr/share/meld |
45 | #include whitelist-usr-share-common.inc | 46 | #include whitelist-usr-share-common.inc |
46 | 47 | ||
47 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in /var. | 48 | # Add the next line to your meld.local if you don't need to compare files in /var. |
48 | #include whitelist-var-common.inc | 49 | #include whitelist-var-common.inc |
49 | 50 | ||
50 | apparmor | 51 | apparmor |
@@ -70,9 +71,9 @@ tracelog | |||
70 | private-bin bzr,cvs,git,hg,meld,python*,svn | 71 | private-bin bzr,cvs,git,hg,meld,python*,svn |
71 | private-cache | 72 | private-cache |
72 | private-dev | 73 | private-dev |
73 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare in /etc. | 74 | # Add the next line to your meld.local if you don't need to compare files in /etc. |
74 | #private-etc alternatives,ca-certificates,crypto-policies,fonts,hostname,hosts,pki,resolv.conf,ssl,subversion | 75 | #private-etc alternatives,ca-certificates,crypto-policies,fonts,hostname,hosts,pki,resolv.conf,ssl,subversion |
75 | # Comment the next line (or add 'ignore private-tmp to your meld.local') if you want to use it as a difftool (#3551) | 76 | # Add 'ignore private-tmp' to your meld.local if you want to use it as difftool (#3551). |
76 | private-tmp | 77 | private-tmp |
77 | 78 | ||
78 | read-only ${HOME}/.ssh | 79 | read-only ${HOME}/.ssh |