diff options
author | Wang Xin <wangxin2015.fnst@cn.fujitsu.com> | 2016-08-24 02:45:03 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-25 23:03:48 +0100 |
commit | fb12fe9994dd4afe85663a3fb285709153820a7a (patch) | |
tree | 57cce8ccaef0116c41df458c2e5a82c2183ddeb1 /meta/recipes-extended/lsb/lsbinitscripts | |
parent | 5bd1a35c8c6bd4759830dcecf3f71e5beef0abf7 (diff) | |
download | poky-fb12fe9994dd4afe85663a3fb285709153820a7a.tar.gz |
lsbinitscripts: 9.64 -> 9.68
Upgrade lsbinitscripts from 9.64 to 9.68.
(From OE-Core rev: d3f6df98318f0751948041a129faed1bd0f7a7c6)
Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lsb/lsbinitscripts')
-rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch | 5 |
1 files changed, 3 insertions, 2 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 index 0809c9be97..17c90029c3 100644 --- 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 | |||
@@ -11,13 +11,14 @@ diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions | |||
11 | index 6850046..11223f7 100644 | 11 | index 6850046..11223f7 100644 |
12 | --- a/rc.d/init.d/functions | 12 | --- a/rc.d/init.d/functions |
13 | +++ b/rc.d/init.d/functions | 13 | +++ b/rc.d/init.d/functions |
14 | @@ -597,5 +597,5 @@ if [ "$_use_systemctl" = "1" ]; then | 14 | @@ -597,6 +597,6 @@ if [ "$_use_systemctl" = "1" ]; then |
15 | fi | 15 | fi |
16 | fi | 16 | fi |
17 | 17 | ||
18 | -strstr "$(cat /proc/cmdline)" "rc.debug" && set -x | 18 | -strstr "$(cat /proc/cmdline)" "rc.debug" && set -x |
19 | +strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true | 19 | +strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true |
20 | 20 | return 0 | |
21 | |||
21 | -- | 22 | -- |
22 | 2.1.0 | 23 | 2.1.0 |
23 | 24 | ||