diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch')
-rw-r--r-- | poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch new file mode 100644 index 000000000..e912daa70 --- /dev/null +++ b/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch @@ -0,0 +1,33 @@ +From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001 +From: Fan Xin <fan.xin@jp.fujitsu.com> +Date: Mon, 5 Jun 2017 16:26:47 +0900 +Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Rebase on 9.72 + +Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> +Upstream-Status: Pending + +--- + rc.d/init.d/functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions +index 2e3da964..1a204dec 100644 +--- a/rc.d/init.d/functions ++++ b/rc.d/init.d/functions +@@ -59,7 +59,7 @@ systemctl_redirect () { + [ -z "${COLUMNS:-}" ] && COLUMNS=80 + + if [ -z "${CONSOLETYPE:-}" ]; then +- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then ++ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then + CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" + else + CONSOLETYPE="serial" +-- +2.15.1 + |