summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-07-03 14:32:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 00:01:21 +0100
commit86fc0b2e3a79b5f0e50ec8d6f46794ae37a10858 (patch)
treef59b965d65d5ab0ea0c73c908a7396b426788f6a
parenteb29cea7296ca62e96fdcfadefcca03b2383ff85 (diff)
downloadpoky-86fc0b2e3a79b5f0e50ec8d6f46794ae37a10858.tar.gz
lsbinitscripts: avoid exit 1 in functions script
If 'rc.debug' is not in kernel parameters, the functions script would exit 1 which causes other init scripts that source it exit 1. This is not what we want. [YOCTO #7948] (From OE-Core rev: 080a7fbd876274410107732f175037fcea4d53ca) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch23
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts_9.63.bb1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
new file mode 100644
index 0000000000..0809c9be97
--- /dev/null
+++ b/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Pending
2
3Subject: functions: avoid exit 1 which causes init scripts to fail
4
5Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
6---
7 rc.d/init.d/functions | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
11index 6850046..11223f7 100644
12--- a/rc.d/init.d/functions
13+++ b/rc.d/init.d/functions
14@@ -597,5 +597,5 @@ if [ "$_use_systemctl" = "1" ]; then
15 fi
16 fi
17
18-strstr "$(cat /proc/cmdline)" "rc.debug" && set -x
19+strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true
20
21--
222.1.0
23
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.63.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.63.bb
index b9554647e1..b937c15545 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.63.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.63.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
8S="${WORKDIR}/initscripts-${PV}" 8S="${WORKDIR}/initscripts-${PV}"
9SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.63.tar.bz2/1ae0f15e54a904ac30185548d43daa1c/initscripts-9.63.tar.bz2 \ 9SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.63.tar.bz2/1ae0f15e54a904ac30185548d43daa1c/initscripts-9.63.tar.bz2 \
10 file://functions.patch \ 10 file://functions.patch \
11 file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \
11 " 12 "
12 13
13SRC_URI[md5sum] = "1ae0f15e54a904ac30185548d43daa1c" 14SRC_URI[md5sum] = "1ae0f15e54a904ac30185548d43daa1c"