[oe-commits] [meta-openembedded] 09/39: syslog-ng.inc: fix prerm script & class includes
git at git.openembedded.org
git at git.openembedded.org
Thu May 19 10:10:36 UTC 2016
martin_jansa pushed a commit to branch krogoth-next
in repository meta-openembedded.
commit 5e2bb87e66bfb712b9c25421f1d31a555a279e8a
Author: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
AuthorDate: Fri May 6 11:00:49 2016 -0300
syslog-ng.inc: fix prerm script & class includes
The order of class includes is very important because it's the order in
which classes are evaluated. Both update-rc.d and update-alternatives
write to the prerm script, so the class order decides the script code
ordering. As they are now, prerm is:
#!/bin/sh
update-alternatives --remove syslog-init /etc/init.d/syslog.syslog-ng
if [ -z "$D" ]; then
/etc/init.d/syslog stop
fi
This causes errors because when syslog-ng is the only alternative it is
removed and then the script tries to stop it (No such file or directory)
but even if there are other alternatives, the script tries to stop
something other than syslog-ng which was removed.
By reversing the include order, prerm gets generated correctly and it
tries to stop syslog-ng before removing it:
if [ -z "$D" ]; then
/etc/init.d/syslog stop
fi
update-alternatives --remove syslog-init /etc/init.d/syslog.syslog-ng
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 382dc5e..4e0f697 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -22,7 +22,7 @@ SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source
file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \
"
-inherit autotools systemd pkgconfig update-rc.d update-alternatives
+inherit autotools systemd pkgconfig update-alternatives update-rc.d
EXTRA_OECONF = " \
--enable-dynamic-linking \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list