diff options
author | 2024-03-22 13:44:53 -0300 | |
---|---|---|
committer | 2024-03-24 03:42:59 -0300 | |
commit | 04efbb27631e2f4abb5f1c0a915612e8cc98397c (patch) | |
tree | 3b0c5d360a796880024a1c14e251522fb36ea5d7 /etc/profile-a-l/googler-common.profile | |
parent | sstmp.profile: sort disable includes (diff) | |
download | firejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.tar.gz firejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.tar.zst firejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.zip |
profiles: replace x11 socket blacklist with disable-X11.inc
Replace all occurrences of `blacklist /tmp/.X11-unix` with
`include disable-X11.inc`, which blacklists more X11-related files.
Commands used to search and replace:
$ git grep -Ilz '^blacklist /tmp/.X11-unix' -- \
etc/profile*/*.profile | xargs -0 perl -0 -pi -e '\
s/\nblacklist \/tmp\/.X11-unix\n/\n/; \
s/(\ninclude disable-xdg.inc\n)/\ninclude disable-X11.inc$1/; \
s/(\ninclude disable-[^Xx\n]+\n)(\n|# )/$1include disable-X11.inc\n$2/'
Note: The following files were also edited manually:
* etc/profile-a-l/erd.profile
* etc/profile-a-l/links-common.profile
* etc/profile-m-z/termshark.profile
* etc/profile-m-z/tmux.profile
* etc/profile-m-z/tshark.profile
Relates to #4462 #4854.
Diffstat (limited to 'etc/profile-a-l/googler-common.profile')
-rw-r--r-- | etc/profile-a-l/googler-common.profile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/profile-a-l/googler-common.profile b/etc/profile-a-l/googler-common.profile index 58769643a..e1ec5f4b9 100644 --- a/etc/profile-a-l/googler-common.profile +++ b/etc/profile-a-l/googler-common.profile | |||
@@ -7,7 +7,6 @@ include googler-common.local | |||
7 | # added by caller profile | 7 | # added by caller profile |
8 | #include globals.local | 8 | #include globals.local |
9 | 9 | ||
10 | blacklist /tmp/.X11-unix | ||
11 | blacklist ${RUNUSER} | 10 | blacklist ${RUNUSER} |
12 | 11 | ||
13 | noblacklist ${HOME}/.w3m | 12 | noblacklist ${HOME}/.w3m |
@@ -23,6 +22,7 @@ include disable-exec.inc | |||
23 | include disable-interpreters.inc | 22 | include disable-interpreters.inc |
24 | include disable-programs.inc | 23 | include disable-programs.inc |
25 | include disable-shell.inc | 24 | include disable-shell.inc |
25 | include disable-X11.inc | ||
26 | include disable-xdg.inc | 26 | include disable-xdg.inc |
27 | 27 | ||
28 | whitelist ${HOME}/.w3m | 28 | whitelist ${HOME}/.w3m |