summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/lsb/lsbinitscripts/functions.patch')
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts/functions.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
index 9c58d90c38..e912daa701 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
+++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
@@ -1,7 +1,7 @@
1From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001 1From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001
2From: Fan Xin <fan.xin@jp.fujitsu.com> 2From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Mon, 5 Jun 2017 16:26:47 +0900 3Date: Mon, 5 Jun 2017 16:26:47 +0900
4Subject: [PATCH] Upstream-Status: Inappropriate [configuration] 4Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration]
5 5
6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> 6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
7Signed-off-by: Saul Wold <sgw@linux.intel.com> 7Signed-off-by: Saul Wold <sgw@linux.intel.com>
@@ -10,23 +10,24 @@ Rebase on 9.72
10 10
11Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> 11Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
12Upstream-Status: Pending 12Upstream-Status: Pending
13
13--- 14---
14 initscripts-9.72/rc.d/init.d/functions | 2 +- 15 rc.d/init.d/functions | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
16 17
17diff --git a/initscripts-9.72/rc.d/init.d/functions b/initscripts-9.72/rc.d/init.d/functions 18diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
18index 0f627f1..a6aa092 100644 19index 2e3da964..1a204dec 100644
19--- a/initscripts-9.72/rc.d/init.d/functions 20--- a/rc.d/init.d/functions
20+++ b/initscripts-9.72/rc.d/init.d/functions 21+++ b/rc.d/init.d/functions
21@@ -59,7 +59,7 @@ systemctl_redirect () { 22@@ -59,7 +59,7 @@ systemctl_redirect () {
22 [ -z "${COLUMNS:-}" ] && COLUMNS=80 23 [ -z "${COLUMNS:-}" ] && COLUMNS=80
23 24
24 if [ -z "${CONSOLETYPE:-}" ]; then 25 if [ -z "${CONSOLETYPE:-}" ]; then
25- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then 26- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then
26+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then 27+ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then
27 CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" 28 CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
28 else 29 else
29 CONSOLETYPE="serial" 30 CONSOLETYPE="serial"
30-- 31--
311.9.1 322.15.1
32 33