functions.patch 1.0 KB

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