summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-10-11 15:43:29 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-11 22:18:36 +0100
commit806a910927f479207d47b06c20a0497e91203266 (patch)
tree24f39e24387564a0bee872a45eb2bb27a13e3f64
parentdaa3c266a7ffa060b52381fa00df518102fceda8 (diff)
downloadopenembedded-core-contrib-806a910927f479207d47b06c20a0497e91203266.tar.gz
openembedded-core-contrib-806a910927f479207d47b06c20a0497e91203266.tar.bz2
openembedded-core-contrib-806a910927f479207d47b06c20a0497e91203266.zip
sysklogd and busybox: ignore return code from init script stop
The init script will return '1' if we try to stop the service and it is not currently running. The prerm scriptlet must not fail because of this because it will cause package deinstallation of upgrade fail if opkg package manager is used. [YOCTO #10299] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index f67bbbc420..b2f1960226 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -423,7 +423,7 @@ pkg_prerm_${PN}-syslog () {
# remove syslog
if test "x$D" = "x"; then
if test "$1" = "upgrade" -o "$1" = "remove"; then
- ${sysconfdir}/init.d/syslog stop
+ ${sysconfdir}/init.d/syslog stop || :
fi
fi
}
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 1e363db6e8..5c15ffe8ab 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -55,7 +55,7 @@ ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf"
pkg_prerm_${PN} () {
if test "x$D" = "x"; then
if test "$1" = "upgrade" -o "$1" = "remove"; then
- /etc/init.d/syslog stop
+ /etc/init.d/syslog stop || :
fi
fi
}