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 b76dc25 ("New profile: daisy (#5935)", 2023-08-02). Relates to #4462 #4854.
netblue30 · Mar 23, 2024 · 1c4a080 · 1c4a080
1 parent a9dc21f
commit 1c4a080
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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