Files
poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
Ross Burton e164b46c30 lsb: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

(From OE-Core rev: fc856d4539a13f1ea6bf7ce347e9ca85577ecfb8)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-07 06:34:51 -08:00

22 lines
623 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(-)
Index: initscripts-9.72/rc.d/init.d/functions
===================================================================
--- initscripts-9.72.orig/rc.d/init.d/functions
+++ initscripts-9.72/rc.d/init.d/functions
@@ -686,6 +686,6 @@ if [ "$_use_systemctl" = "1" ]; then
fi
fi
-strstr "$(cat /proc/cmdline)" "rc.debug" && set -x
+strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true
return 0