diff options
| author |   Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-10-11 15:43:29 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-11 22:19:21 +0100 |
| commit | df80b8107660d40000226d66f5c981f437f79325 (patch) | |
| tree | 3e2110d3eef39c5d7038a382c11cb311d0cc7371 | |
| parent | 83e4e27246a33eccfc329086444eaa925ccb8499 (diff) | |
| download | openembedded-core-contrib-df80b8107660d40000226d66f5c981f437f79325.tar.gz | |
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]
(From OE-Core rev: 806a910927f479207d47b06c20a0497e91203266)
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.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/sysklogd/sysklogd.inc | 2 |
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 } |