diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2015-07-03 14:32:58 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-07 23:57:12 +0100 |
| commit | 080a7fbd876274410107732f175037fcea4d53ca (patch) | |
| tree | ae187bcd1b380f713b5709cb83d8ef0858bd2aa6 /meta/recipes-extended/lsb | |
| parent | dded280d26b2a5ca2a1e4ac787d36cdd13b603d3 (diff) | |
| download | openembedded-core-contrib-080a7fbd876274410107732f175037fcea4d53ca.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]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/lsb')
| -rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts_9.63.bb | 1 |
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 00000000000..0809c9be978 --- /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 + diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.63.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.63.bb index b9554647e16..b937c155459 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" S="${WORKDIR}/initscripts-${PV}" SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.63.tar.bz2/1ae0f15e54a904ac30185548d43daa1c/initscripts-9.63.tar.bz2 \ file://functions.patch \ + file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ " SRC_URI[md5sum] = "1ae0f15e54a904ac30185548d43daa1c" |