From 1c4a080bf388df897ef87a290be5cee5870f99e4 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 22 Mar 2024 15:06:14 -0300 Subject: [PATCH] profiles: comment "include disable-X11.inc" for "x11 none" If `x11 none` is used, comment the include of disable-X11.inc to avoid including it twice. Note: This is already done in some profiles. Commands used to search and replace: $ git grep -Ilz '^x11 none' -- etc/profile*/*.profile | xargs -0 perl -pi -e 's/^(include disable-X11.inc)$/#$1 # x11 none/' This was apparently first done on commit b76dc25f1 ("New profile: daisy (#5935)", 2023-08-02). Relates to #4462 #4854. --- etc/profile-a-l/bpftop.profile | 2 +- etc/profile-a-l/cloneit.profile | 2 +- etc/profile-a-l/deadlink.profile | 2 +- etc/profile-a-l/dexios.profile | 2 +- etc/profile-a-l/editorconfiger.profile | 2 +- etc/profile-a-l/gnome-keyring-daemon.profile | 2 +- etc/profile-m-z/mimetype.profile | 2 +- etc/profile-m-z/qpdf.profile | 2 +- etc/profile-m-z/statusof.profile | 2 +- etc/profile-m-z/tvnamer.profile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/etc/profile-a-l/bpftop.profile b/etc/profile-a-l/bpftop.profile index 8c64a77c678..2954331bbc3 100644 --- a/etc/profile-a-l/bpftop.profile +++ b/etc/profile-a-l/bpftop.profile @@ -17,7 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc include whitelist-common.inc diff --git a/etc/profile-a-l/cloneit.profile b/etc/profile-a-l/cloneit.profile index 445ef4890e9..1175a717553 100644 --- a/etc/profile-a-l/cloneit.profile +++ b/etc/profile-a-l/cloneit.profile @@ -17,7 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc include whitelist-run-common.inc diff --git a/etc/profile-a-l/deadlink.profile b/etc/profile-a-l/deadlink.profile index f7535c5977d..d9a26bbfae0 100644 --- a/etc/profile-a-l/deadlink.profile +++ b/etc/profile-a-l/deadlink.profile @@ -22,7 +22,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc include whitelist-run-common.inc diff --git a/etc/profile-a-l/dexios.profile b/etc/profile-a-l/dexios.profile index 55d6c83cea5..9ed6676c85b 100644 --- a/etc/profile-a-l/dexios.profile +++ b/etc/profile-a-l/dexios.profile @@ -17,7 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc whitelist ${DOWNLOADS} diff --git a/etc/profile-a-l/editorconfiger.profile b/etc/profile-a-l/editorconfiger.profile index a921ae2d560..4c73019720c 100644 --- a/etc/profile-a-l/editorconfiger.profile +++ b/etc/profile-a-l/editorconfiger.profile @@ -16,7 +16,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc apparmor diff --git a/etc/profile-a-l/gnome-keyring-daemon.profile b/etc/profile-a-l/gnome-keyring-daemon.profile index 0370b04728a..c05ee17fae0 100644 --- a/etc/profile-a-l/gnome-keyring-daemon.profile +++ b/etc/profile-a-l/gnome-keyring-daemon.profile @@ -15,7 +15,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc #include disable-X11.inc # x11 none -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc whitelist ${RUNUSER}/gnupg diff --git a/etc/profile-m-z/mimetype.profile b/etc/profile-m-z/mimetype.profile index 4b62624bbbe..dd78273697b 100644 --- a/etc/profile-m-z/mimetype.profile +++ b/etc/profile-m-z/mimetype.profile @@ -11,7 +11,7 @@ blacklist ${RUNUSER}/wayland-* include disable-exec.inc include disable-proc.inc -include disable-X11.inc +#include disable-X11.inc # x11 none apparmor caps.drop all diff --git a/etc/profile-m-z/qpdf.profile b/etc/profile-m-z/qpdf.profile index edec7cf0ae3..c3aeb81382c 100644 --- a/etc/profile-m-z/qpdf.profile +++ b/etc/profile-m-z/qpdf.profile @@ -18,7 +18,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc whitelist ${DOCUMENTS} diff --git a/etc/profile-m-z/statusof.profile b/etc/profile-m-z/statusof.profile index 25c8df6800d..955cb649d76 100644 --- a/etc/profile-m-z/statusof.profile +++ b/etc/profile-m-z/statusof.profile @@ -20,7 +20,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc include whitelist-common.inc diff --git a/etc/profile-m-z/tvnamer.profile b/etc/profile-m-z/tvnamer.profile index 24439672a4c..6a0f2a8cde8 100644 --- a/etc/profile-m-z/tvnamer.profile +++ b/etc/profile-m-z/tvnamer.profile @@ -23,7 +23,7 @@ include disable-interpreters.inc include disable-programs.inc include disable-proc.inc include disable-shell.inc -include disable-X11.inc +#include disable-X11.inc # x11 none include disable-xdg.inc mkdir ${HOME}/.config/tvnamer