mirror of
https://git.yoctoproject.org/poky
synced 2026-02-09 18:23:02 +01:00
86fc0b2e3a
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>
24 lines
561 B
Diff
24 lines
561 B
Diff
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
|
|
|