aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-07-03 14:26:50 +0800
committerChen Qi <Qi.Chen@windriver.com>2015-07-03 14:30:07 +0800
commit813b3517b05e0cedc5c6150a4530eb1dc142bc43 (patch)
treeee50357fed6fc42ec68d26e92450e4cfe6dc55f1 /meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
parentdd09fab685de2eaf04aa5ab60f8220b89c1deae9 (diff)
downloadopenembedded-core-contrib-ChenQi/lsbinitscripts.tar.gz
lsbinitscripts: avoid exit 1 in functions scriptChenQi/lsbinitscripts
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] Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Diffstat (limited to 'meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch')
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch23
1 files changed, 23 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 @@
+Upstream-Status: Pending
+
+Subject: functions: avoid exit 1 which causes init scripts to fail
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ 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 6850046..11223f7 100644
+--- a/rc.d/init.d/functions
++++ b/rc.d/init.d/functions
+@@ -597,5 +597,5 @@ if [ "$_use_systemctl" = "1" ]; then
+ fi
+ fi
+
+-strstr "$(cat /proc/cmdline)" "rc.debug" && set -x
++strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true
+
+--
+2.1.0
+