diff options
author | 2017-01-20 09:03:21 -0500 | |
---|---|---|
committer | 2017-01-20 09:03:21 -0500 | |
commit | 269936b7499598799bc406bdbf1ea558c034d05c (patch) | |
tree | b5a06fe188fb2fbad93a261eb73858d7dac61fcd /etc | |
parent | profile merges (diff) | |
parent | Merge pull request #1056 from SYN-cook/master (diff) | |
download | firejail-269936b7499598799bc406bdbf1ea558c034d05c.tar.gz firejail-269936b7499598799bc406bdbf1ea558c034d05c.tar.zst firejail-269936b7499598799bc406bdbf1ea558c034d05c.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to 'etc')
-rw-r--r-- | etc/disable-common.inc | 1 | ||||
-rw-r--r-- | etc/disable-programs.inc | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/etc/disable-common.inc b/etc/disable-common.inc index 8e1e052a9..e542e3ebb 100644 --- a/etc/disable-common.inc +++ b/etc/disable-common.inc | |||
@@ -138,6 +138,7 @@ blacklist ${HOME}/.Private | |||
138 | blacklist ${HOME}/.ssh | 138 | blacklist ${HOME}/.ssh |
139 | blacklist ${HOME}/.cert | 139 | blacklist ${HOME}/.cert |
140 | blacklist ${HOME}/.gnome2/keyrings | 140 | blacklist ${HOME}/.gnome2/keyrings |
141 | blacklist ${HOME}/.local/share/keyrings | ||
141 | blacklist ${HOME}/.kde4/share/apps/kwallet | 142 | blacklist ${HOME}/.kde4/share/apps/kwallet |
142 | blacklist ${HOME}/.kde/share/apps/kwallet | 143 | blacklist ${HOME}/.kde/share/apps/kwallet |
143 | blacklist ${HOME}/.local/share/kwalletd | 144 | blacklist ${HOME}/.local/share/kwalletd |
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index 96bf1464b..b307978da 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -177,8 +177,17 @@ blacklist ${HOME}/.icedove | |||
177 | blacklist ${HOME}/.inkscape | 177 | blacklist ${HOME}/.inkscape |
178 | blacklist ${HOME}/.jitsi | 178 | blacklist ${HOME}/.jitsi |
179 | blacklist ${HOME}/.kde/share/apps/gwenview | 179 | blacklist ${HOME}/.kde/share/apps/gwenview |
180 | blacklist ${HOME}/.kde/share/apps/kcookiejar | ||
181 | blacklist ${HOME}/.kde/share/apps/khtml | ||
182 | blacklist ${HOME}/.kde/share/apps/konqsidebartng | ||
183 | blacklist ${HOME}/.kde/share/apps/konqueror | ||
180 | blacklist ${HOME}/.kde/share/apps/okular | 184 | blacklist ${HOME}/.kde/share/apps/okular |
181 | blacklist ${HOME}/.kde/share/config/gwenviewrc | 185 | blacklist ${HOME}/.kde/share/config/gwenviewrc |
186 | blacklist ${HOME}/.kde/share/config/kcookiejarrc | ||
187 | blacklist ${HOME}/.kde/share/config/khtmlrc | ||
188 | blacklist ${HOME}/.kde/share/config/konq_history | ||
189 | blacklist ${HOME}/.kde/share/config/konqsidebartngrc | ||
190 | blacklist ${HOME}/.kde/share/config/konquerorrc | ||
182 | blacklist ${HOME}/.kde/share/config/okularpartrc | 191 | blacklist ${HOME}/.kde/share/config/okularpartrc |
183 | blacklist ${HOME}/.kde/share/config/okularrc | 192 | blacklist ${HOME}/.kde/share/config/okularrc |
184 | blacklist ${HOME}/.killingfloor | 193 | blacklist ${HOME}/.killingfloor |