Read /etc/profile.env if available (glen).

Changed files:
    etc/profile -> 1.49

diff --git a/etc/profile b/etc/profile
index 10df5f12be31bf173625e8682070956a6d923c37..bbf534e737a56d7cfe22005f84299454d26e38b2 100644 (file)
--- a/etc/profile
+++ b/etc/profile
@@ -115,19 +115,24 @@ export PATH USER LOGNAME HOSTNAME HISTFILE HISTSIZE PS1 PS2
 # example:
 # cat /etc/env.d/VARIABLE
 # VARIABLE="value"
-for i in /etc/env.d/* ; do
-       NAME=`basename $i`
-       case $NAME in
-               *~ | *.bak | *.old | *.rpmnew | *.rpmsave )
-                       # nothing
-                       ;;
-               * )
-                       if [ -r $i ]; then
-                               . $i; export $NAME
-                       fi
-                       ;;
-       esac
-done
+if [ -f /etc/profile.env ]; then
+       . /etc/profile.env
+else
+       for i in /etc/env.d/* ; do
+               NAME=${i##*/}
+               case $NAME in
+                       *~ | *.bak | *.old | *.rpmnew | *.rpmsave )
+                               # nothing
+                               ;;
+                       * )
+                               if [ -r $i ]; then
+                                       . $i; export $NAME
+                               fi
+                               ;;
+               esac
+       done
+       unset NAME
+fi
 
 # Scripts:
 for i in /etc/profile.d/*.sh ; do