merge r13914 to 8.09

SVN-Revision: 13915

diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile
index e82408ff83516ec989622e50051a5af945d9fec3..1f680655f71167fbff8acb5796671c737a212992 100644 (file)
--- a/package/base-files/files/etc/profile
+++ b/package/base-files/files/etc/profile
@@ -2,7 +2,8 @@
 [ -f /etc/banner ] && cat /etc/banner
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 [ -f /etc/banner ] && cat /etc/banner
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin

-export HOME=/root
+export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
+export HOME=${HOME:-/root}

 export PS1='\u@\h:\w\$ '
 
 [ -x /bin/more ] || alias more=less
 export PS1='\u@\h:\w\$ '
 
 [ -x /bin/more ] || alias more=less