Merge pull request #5167 from kmk3/mv-sh-profile-blacklist

profiles: move blacklist of /etc/profile.d & blacklist /etc/profile

3 files changed, 3 insertions, 2 deletions

diff --git a/etc/inc/disable-common.inc b/etc/inc/disable-common.inc
index d08ba3646..5918ee640 100644
--- a/etc/inc/disable-common.inc
+++ b/etc/inc/disable-common.inc
@@ -261,7 +261,6 @@ blacklist /etc/grub*
 blacklist /etc/kernel*
 blacklist /etc/logrotate*
 blacklist /etc/modules*
-blacklist /etc/profile.d
 blacklist /etc/rc.local
 # rc1.d, rc2.d, ...
 blacklist /etc/rc?.d
diff --git a/etc/inc/disable-shell.inc b/etc/inc/disable-shell.inc
index 8274b0215..3f19cdcf9 100644
--- a/etc/inc/disable-shell.inc
+++ b/etc/inc/disable-shell.inc
@@ -13,3 +13,5 @@ blacklist ${PATH}/sh
 blacklist ${PATH}/tclsh
 blacklist ${PATH}/tcsh
 blacklist ${PATH}/zsh
+blacklist /etc/profile
+blacklist /etc/profile.d
diff --git a/etc/profile-a-l/kate.profile b/etc/profile-a-l/kate.profile
index 9eadaec12..51296408c 100644
--- a/etc/profile-a-l/kate.profile
+++ b/etc/profile-a-l/kate.profile
@@ -23,8 +23,8 @@ noblacklist ${HOME}/.local/share/kxmlgui5/kateopenheaderplugin
 noblacklist ${HOME}/.local/share/kxmlgui5/katepart
 noblacklist ${HOME}/.local/share/kxmlgui5/kateproject
 noblacklist ${HOME}/.local/share/kxmlgui5/katesearch
-noblacklist /etc/profile.d
 
+# Allows files commonly used by IDEs
 include allow-common-devel.inc
 
 include disable-common.inc