From 6e7a2f88a1c6d1fffe3be81f5b86a06f18a03299 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Wed, 1 Dec 2010 10:54:13 +0100
Subject: CONSOLETYPE - check read access to /dev/stderr (#650103)

---
 rc.d/init.d/functions | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 48ed4d79..1256d10e 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -48,7 +48,13 @@ systemctl_redirect () {
 # Get a sane screen width
 [ -z "${COLUMNS:-}" ] && COLUMNS=80
 
-[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
+if [ -z "${CONSOLETYPE:-}" ]; then
+  if [ -r "/dev/stderr" ]; then
+    CONSOLETYPE="$(/sbin/consoletype < /dev/stderr)"
+  else
+    CONSOLETYPE="$(/sbin/consoletype)"
+  fi
+fi
 
 if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && [ -f /etc/sysconfig/i18n ] ; then
   . /etc/profile.d/lang.sh 2>/dev/null
-- 
cgit v1.2.1