aboutsummaryrefslogtreecommitdiffstats
path: root/etc/templates
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-03-27 12:13:47 +0000
committerLibravatar GitHub <noreply@github.com>2024-03-27 12:13:47 +0000
commit0060b5105b1fc74aecae71b60b473451a8b65020 (patch)
tree4b729d3d9b568ba1b251abf8f5ea1ef02724fca5 /etc/templates
parentprofiles: sort blacklist sections (#6289) (diff)
downloadfirejail-0060b5105b1fc74aecae71b60b473451a8b65020.tar.gz
firejail-0060b5105b1fc74aecae71b60b473451a8b65020.tar.zst
firejail-0060b5105b1fc74aecae71b60b473451a8b65020.zip
profiles: rename disable-X11.inc to disable-x11.inc (#6294)
That is, make "X11" lowercase so that the order of the includes in the disable- section remain the same when sorted with `LC_ALL=C`, as is the case for most of the other sections. That is also likely to be the default in text editors (such as in vim on Arch), so this should make the disable- section more consistent and easier to sort when editing the profile. Also, keep the old include as a redirect to the new one for now to avoid breakage. Commands used to search and replace: git mv etc/inc/disable-X11.inc etc/inc/disable-x11.inc git grep -Ilz 'disable-X11' -- etc | xargs -0 \ perl -pi -e 's/disable-X11/disable-x11/' Relates to #4462 #4854 #6070 #6289. This is a follow-up to #6286.
Diffstat (limited to 'etc/templates')
-rw-r--r--etc/templates/profile.template4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/templates/profile.template b/etc/templates/profile.template
index 29ea55439..347cbeb3c 100644
--- a/etc/templates/profile.template
+++ b/etc/templates/profile.template
@@ -120,7 +120,7 @@ include globals.local
120#include disable-programs.inc 120#include disable-programs.inc
121#include disable-shell.inc 121#include disable-shell.inc
122#include disable-write-mnt.inc 122#include disable-write-mnt.inc
123#include disable-X11.inc 123#include disable-x11.inc
124#include disable-xdg.inc 124#include disable-xdg.inc
125 125
126# This section often mirrors noblacklist section above. The idea is 126# This section often mirrors noblacklist section above. The idea is
@@ -181,7 +181,7 @@ include globals.local
181#seccomp.block-secondary 181#seccomp.block-secondary
182##seccomp-error-action log (only for debugging seccomp issues) 182##seccomp-error-action log (only for debugging seccomp issues)
183#tracelog 183#tracelog
184# Prefer 'x11 none' instead of 'disable-X11.inc' if 'net none' is set 184# Prefer 'x11 none' instead of 'disable-x11.inc' if 'net none' is set
185##x11 none 185##x11 none
186 186
187#disable-mnt 187#disable-mnt