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 <and...@chargestorm.se>
---
 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
-- 
1.8.5.2

_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to