Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Fan Xin <fan.xin@jp.fujitsu.com> |
| 3 | Date: Mon, 5 Jun 2017 16:26:47 +0900 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 4 | Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration] |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | |
| 6 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> |
| 7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
| 8 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 9 | Rebase on 9.72 |
| 10 | |
| 11 | Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> |
| 12 | Upstream-Status: Pending |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 13 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | --- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 15 | rc.d/init.d/functions | 2 +- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions |
| 19 | index 2e3da964..1a204dec 100644 |
| 20 | --- a/rc.d/init.d/functions |
| 21 | +++ b/rc.d/init.d/functions |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 22 | @@ -59,7 +59,7 @@ systemctl_redirect () { |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 23 | [ -z "${COLUMNS:-}" ] && COLUMNS=80 |
| 24 | |
| 25 | if [ -z "${CONSOLETYPE:-}" ]; then |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 26 | - if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then |
| 27 | + if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 28 | CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" |
| 29 | else |
| 30 | CONSOLETYPE="serial" |
| 31 | -- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 32 | 2.15.1 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 33 | |