summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lsb/lsbinitscripts
diff options
context:
space:
mode:
authorFan Xin <fan.xin@jp.fujitsu.com>2017-06-05 16:40:05 +0900
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-06 19:52:26 +0100
commitccc9b7bbd2e51d1bf1b488958d5f2275ac691e02 (patch)
treefbeba63ef0dfa0084f8413f3453a95178226fc91 /meta/recipes-extended/lsb/lsbinitscripts
parent5dd94a5dc49465f59733e333d28eaa0bed91cbfd (diff)
downloadpoky-ccc9b7bbd2e51d1bf1b488958d5f2275ac691e02.tar.gz
lsbinitscripts: Upgrade to 9.72
1. Upgrade lsbinitscripts from 9.68 to 9.72 2. Rebase the following patch file. functions.patch (From OE-Core rev: be117d6ea79882d10cce4c061385832e26d23bff) Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lsb/lsbinitscripts')
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts/functions.patch43
1 files changed, 24 insertions, 19 deletions
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
index a756d047ef..feef610f15 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
+++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
@@ -1,26 +1,31 @@
1Upstream-Status: Inappropriate [configuration] 1From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001
2From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Mon, 5 Jun 2017 16:26:47 +0900
4Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
2 5
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> 6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4Signed-off-by: Saul Wold <sgw@linux.intel.com> 7Signed-off-by: Saul Wold <sgw@linux.intel.com>
5 8
6Index: initscripts-9.43/rc.d/init.d/functions 9Rebase on 9.72
7=================================================================== 10
8--- initscripts-9.43.orig/rc.d/init.d/functions 11Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
9+++ initscripts-9.43/rc.d/init.d/functions 12---
10@@ -13,6 +13,7 @@ umask 022 13 initscripts-9.72/rc.d/init.d/functions | 2 +-
11 PATH="/sbin:/usr/sbin:/bin:/usr/bin" 14 1 file changed, 1 insertion(+), 1 deletion(-)
12 export PATH 15
13 16diff --git a/initscripts-9.72/rc.d/init.d/functions b/initscripts-9.72/rc.d/init.d/functions
14+ 17index 0f627f1..a6aa092 100644
15 if [ $PPID -ne 1 -a -z "$SYSTEMCTL_SKIP_REDIRECT" ] && \ 18--- a/initscripts-9.72/rc.d/init.d/functions
16 ( /bin/mountpoint -q /cgroup/systemd || /bin/mountpoint -q /sys/fs/cgroup/systemd ) ; then 19+++ b/initscripts-9.72/rc.d/init.d/functions
17 case "$0" in 20@@ -59,7 +59,7 @@ systemctl_redirect () {
18@@ -54,7 +55,7 @@ systemctl_redirect () {
19 [ -z "${COLUMNS:-}" ] && COLUMNS=80 21 [ -z "${COLUMNS:-}" ] && COLUMNS=80
20 22
21 if [ -z "${CONSOLETYPE:-}" ]; then 23 if [ -z "${CONSOLETYPE:-}" ]; then
22- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then 24- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then
23+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then 25+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then
24 CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" 26 CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
25 else 27 else
26 CONSOLETYPE="serial" 28 CONSOLETYPE="serial"
29--
301.9.1
31