sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Markus Lehtonen 2016-10-11 15:43:29 +03:00 committed by Richard Purdie
parent 83e4e27246
commit df80b81076
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/busybox/busybox.inc
View File

@ -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
}

2
meta/recipes-extended/sysklogd/sysklogd.inc
View File

@ -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
}