blob: e912daa701a8c0fbaf749e343ab661b5f1dcb508 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Mon, 5 Jun 2017 16:26:47 +0900
Brad Bishop316dfdd2018-06-25 12:45:53 -04004Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05005
6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
8
Brad Bishopd7bf8c12018-02-25 22:55:05 -05009Rebase on 9.72
10
11Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
12Upstream-Status: Pending
Brad Bishop316dfdd2018-06-25 12:45:53 -040013
Brad Bishopd7bf8c12018-02-25 22:55:05 -050014---
Brad Bishop316dfdd2018-06-25 12:45:53 -040015 rc.d/init.d/functions | 2 +-
Brad Bishopd7bf8c12018-02-25 22:55:05 -050016 1 file changed, 1 insertion(+), 1 deletion(-)
17
Brad Bishop316dfdd2018-06-25 12:45:53 -040018diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
19index 2e3da964..1a204dec 100644
20--- a/rc.d/init.d/functions
21+++ b/rc.d/init.d/functions
Brad Bishopd7bf8c12018-02-25 22:55:05 -050022@@ -59,7 +59,7 @@ systemctl_redirect () {
Patrick Williamsc124f4f2015-09-15 14:41:29 -050023 [ -z "${COLUMNS:-}" ] && COLUMNS=80
24
25 if [ -z "${CONSOLETYPE:-}" ]; then
Brad Bishop316dfdd2018-06-25 12:45:53 -040026- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then
27+ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then
Brad Bishopd7bf8c12018-02-25 22:55:05 -050028 CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
29 else
30 CONSOLETYPE="serial"
31--
Brad Bishop316dfdd2018-06-25 12:45:53 -0400322.15.1
Brad Bishopd7bf8c12018-02-25 22:55:05 -050033