Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

This commit is contained in:
Arne Fitzenreiter
2013-02-05 22:37:05 +01:00

View File

@@ -10,3 +10,9 @@ alias mv='mv -i'
if [ -f /etc/bashrc ]; then
. /etc/bashrc
fi
# Automatically logout only console users after 10 minutes.
export TMOUT=0
if [ -z "${SSH_TTY}" ] && [ -z "${STY}" ]; then
export TMOUT=600
fi