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/erd.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/erd.profile')
-rw-r--r-- | etc/profile-a-l/erd.profile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/profile-a-l/erd.profile b/etc/profile-a-l/erd.profile index 8ab145016..d821f5882 100644 --- a/etc/profile-a-l/erd.profile +++ b/etc/profile-a-l/erd.profile | |||
@@ -7,9 +7,8 @@ include erd.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | blacklist /tmp/.X11-unix | ||
11 | |||
12 | include disable-exec.inc | 10 | include disable-exec.inc |
11 | #include disable-X11.inc # x11 none | ||
13 | 12 | ||
14 | apparmor | 13 | apparmor |
15 | caps.drop all | 14 | caps.drop all |