Skip to contentSkip to conversation

lsbinitscripts: avoid exit 1 in functions

PATCH New Chen Qi 1 participant 2 messages Jul 3, 2015

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover lsbinitscripts: avoid exit 1 in functions

The following changes since commit dd09fab685de2eaf04aa5ab60f8220b89c1deae9:

tune-core2.inc: set X86ARCH32 to i686 (instead of i586) (2015-07-02 23:08:27 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib ChenQi/lsbinitscripts
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/lsbinitscripts

Chen Qi (1):
lsbinitscripts: avoid exit 1 in functions script

 ...void-exit-1-which-causes-init-scripts-to-.patch | 23 ++++++++++++++++++++++
 meta/recipes-extended/lsb/lsbinitscripts_9.63.bb   |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 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 <[email protected]>
---
 ...void-exit-1-which-causes-init-scripts-to-.patch | 23 ++++++++++++++++++++++
 meta/recipes-extended/lsb/lsbinitscripts_9.63.bb   |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch new file +23 -0
new file mode 100644
index 0000000..0809c9b
@@ -0,0 +1,23 @@
+Upstream-Status: Pending
+
+Subject: functions: avoid exit 1 which causes init scripts to fail
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ 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
+
meta/recipes-extended/lsb/lsbinitscripts_9.63.bb +1 -0
index b955464..b937c15 100644
@@ -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"
Signature · 1 line
1.9.1