diff options
| author |  The Fox in the Shell <KellerFuchs@hashbang.sh> | 2017-01-09 23:22:31 +0100 |
|---|---|---|
| committer | The Fox in the Shell <KellerFuchs@hashbang.sh> | 2017-01-09 23:22:31 +0100 |
| commit | ec719b9e0f4f7258b5f752af4857649a34a35dfe (patch) | |
| tree | 2889479d9c69cd04843bcc733670ce327cd11845 /etc/disable-common.inc | |
| parent | Merge pull request #1027 from reinerh/cve-references2 (diff) | |
| download | firejail-ec719b9e0f4f7258b5f752af4857649a34a35dfe.tar.gz firejail-ec719b9e0f4f7258b5f752af4857649a34a35dfe.tar.zst firejail-ec719b9e0f4f7258b5f752af4857649a34a35dfe.zip | |
etc: Support local customizations in *.inc
This is useful for places, like hashbang.sh, which have site-specific
modifications of the *.inc files.
With the current setup, the package manager cannot automatically install
updated versions of those files, as it would need to somehow merge the
site-specific and upstream changes. Having the site-specific changes in
separate files solves this.
Diffstat (limited to 'etc/disable-common.inc')
| -rw-r--r-- | etc/disable-common.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/disable-common.inc b/etc/disable-common.inc index efe5c850d..187d26c83 100644 --- a/etc/disable-common.inc +++ b/etc/disable-common.inc | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # Local customizations come here | ||
| 2 | include /etc/firejail/disable-common.local | ||
| 3 | |||
| 1 | # History files in $HOME | 4 | # History files in $HOME |
| 2 | blacklist-nolog ${HOME}/.history | 5 | blacklist-nolog ${HOME}/.history |
| 3 | blacklist-nolog ${HOME}/.*_history | 6 | blacklist-nolog ${HOME}/.*_history |