summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
blob: feef610f15172c87d39c7bc5ca436d6d464a23f6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001
From: Fan Xin <fan.xin@jp.fujitsu.com>
Date: Mon, 5 Jun 2017 16:26:47 +0900
Subject: [PATCH] Upstream-Status: Inappropriate [configuration]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

Rebase on 9.72

Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
---
 initscripts-9.72/rc.d/init.d/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/initscripts-9.72/rc.d/init.d/functions b/initscripts-9.72/rc.d/init.d/functions
index 0f627f1..a6aa092 100644
--- a/initscripts-9.72/rc.d/init.d/functions
+++ b/initscripts-9.72/rc.d/init.d/functions
@@ -59,7 +59,7 @@ systemctl_redirect () {
 [ -z "${COLUMNS:-}" ] && COLUMNS=80
 
 if [ -z "${CONSOLETYPE:-}" ]; then
-    if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then
+    if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then
         CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
     else
         CONSOLETYPE="serial"
-- 
1.9.1