diff options
Diffstat (limited to 'meta/recipes-extended/lsb/lsbinitscripts/functions.patch')
-rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts/functions.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch deleted file mode 100644 index e912daa701..0000000000 --- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
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 | |||
6 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
8 | |||
9 | Rebase on 9.72 | ||
10 | |||
11 | Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> | ||
12 | Upstream-Status: Pending | ||
13 | |||
14 | --- | ||
15 | rc.d/init.d/functions | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
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 | ||
22 | @@ -59,7 +59,7 @@ systemctl_redirect () { | ||
23 | [ -z "${COLUMNS:-}" ] && COLUMNS=80 | ||
24 | |||
25 | if [ -z "${CONSOLETYPE:-}" ]; then | ||
26 | - if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then | ||
27 | + if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then | ||
28 | CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" | ||
29 | else | ||
30 | CONSOLETYPE="serial" | ||
31 | -- | ||
32 | 2.15.1 | ||
33 | |||