[oe-commits] Anders Darander : systemd-compat-units: do not mask available services
git at git.openembedded.org
git at git.openembedded.org
Tue Jan 14 11:30:17 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 5aea3d375b717d96f8f916f2f830e8f8649a4991
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5aea3d375b717d96f8f916f2f830e8f8649a4991
Author: Anders Darander <anders at chargestorm.se>
Date: Fri Jan 10 08:15:03 2014 +0100
systemd-compat-units: do not mask available services
Do also check systemd_unitdir/system/ for available unit files.
This was hiding dnsmasq.service for us, as /etc/systemd/system has
priority over systemd_unitdir/system...
Signed-off-by: Anders Darander <anders at chargestorm.se>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-core/systemd/systemd-compat-units.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb
index 9f28283..e32ad79 100644
--- a/meta/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta/recipes-core/systemd/systemd-compat-units.bb
@@ -42,7 +42,7 @@ pkg_postinst_${PN} () {
fi
for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
- if [ \( -e $i -o $i.sh \) -a ! -e $D${sysconfdir}/systemd/system/$i.service ] ; then
+ if [ \( -e $i -o $i.sh \) -a ! \( -e $D${sysconfdir}/systemd/system/$i.service -o -e $D${systemd_unitdir}/system/$i.service \) ] ; then
echo -n "$i: " ; systemctl ${OPTS} mask $i.service
fi
done ; echo
More information about the Openembedded-commits
mailing list