From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 5 Feb 2013 21:37:05 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-rc2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18b39b38aed96e348b3996f7e69aed88c7c95d4f;hp=d1f2931c85b8c117ffefed0c14d04dda09af105d;p=people%2Fpmueller%2Fipfire-2.x.git

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

diff --git a/config/bash/dot_bashrc b/config/bash/dot_bashrc
index 6e6d1e1f17..90b96b4326 100644
--- a/config/bash/dot_bashrc
+++ b/config/bash/dot_bashrc
@@ -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