- fix setting up sane defaults for rootshell/bash/ksh

Changed files:
    etc/profile -> 1.7

diff --git a/etc/profile b/etc/profile
index 64f5c20e0d79cdc224305d69ad84e8a3b5827332..bf8faceb8141dd204b3df448dd5b0e2a0927695d 100644 (file)
--- a/etc/profile
+++ b/etc/profile
@@ -16,6 +16,7 @@ LOGNAME=$USER
 MAIL="/var/mail/$USER"
 
 HOSTNAME=`/bin/hostname`
+HISTFILE="$HOME/.history"
 HISTSIZE=1000
 HISTFILESIZE=1000
 
@@ -27,7 +28,16 @@ if [ "$TERM" = "" -o "$TERM" = "unknown" ]; then
  TERM=linux
 fi
 
-case "${0#\-}" in
+SH="${0#\-}"
+if [ "`id -ur" = "0" ]; then
+       if [ ! -n KSH_VERSION ]; then
+               SH=ksh
+       elif [ ! -n BASH_VERSION ]; then
+               SH=bash
+       fi
+fi
+
+case "$SH" in
   ash)
        PS1="${HOSTNAME}\$ "
        ;;
@@ -64,7 +74,8 @@ case "${0#\-}" in
        ;;
 esac
 
-export PATH PS1 PS2 HOSTNAME HISTSIZE HISTFILESIZE USER LOGNAME MAIL
+unset SH
+export PATH PS1 PS2 HOSTNAME HISTFILE HISTSIZE HISTFILESIZE USER LOGNAME MAIL
 
 for i in /etc/profile.d/*.sh ; do
        if [ -x $i ]; then