summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-files
diff options
context:
space:
mode:
authorDiego Rondini <diego.ml@zoho.com>2016-04-29 12:24:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 08:03:55 +0100
commit8961bc4b71723477a3b4a837a1d9c25c1b860b9e (patch)
tree6793f773164a21ac7c336325acabdeb49076eba3 /meta/recipes-core/base-files
parent53048d65402211e0caa9a7c8b90e3d9711a5262a (diff)
downloadopenembedded-core-contrib-8961bc4b71723477a3b4a837a1d9c25c1b860b9e.tar.gz
openembedded-core-contrib-8961bc4b71723477a3b4a837a1d9c25c1b860b9e.tar.bz2
openembedded-core-contrib-8961bc4b71723477a3b4a837a1d9c25c1b860b9e.zip
base-files: add some safety checks in profile
Add some safety checks when sourcing files in /etc/profile.d/, in particular: - source only *.sh files, not every file. This is the practice in use in both Fedora and Debian/Ubuntu (see https://help.ubuntu.com/community/EnvironmentVariables#A.2Fetc.2Fprofile.d.2F.2A.sh); - check the input is actually a file and is readable. This check is especially important if profile.d is empty, as "*.sh" will get expanded only if profile.d is not empty. Previously if profile.d was present but empty, "/etc/profile.d/*" was sourced causing errors on login and breaking stuff, for example X startup. Signed-off-by: Diego Rondini <diego.ml@zoho.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/base-files')
-rw-r--r--meta/recipes-core/base-files/base-files/profile6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index 53c2680409..e98e786b12 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -20,8 +20,10 @@ if [ "$PS1" ]; then
fi
if [ -d /etc/profile.d ]; then
- for i in /etc/profile.d/* ; do
- . $i
+ for i in /etc/profile.d/*.sh ; do
+ if [ -f $i -a -r $i ]; then
+ . $i
+ fi
done
unset i
fi