From: Anders Darander Date: Fri, 10 Jan 2014 07:15:03 +0000 (+0100) Subject: systemd-compat-units: do not mask available services X-Git-Tag: 2015-4~4059 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5aea3d375b717d96f8f916f2f830e8f8649a4991;p=openembedded-core.git 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 Signed-off-by: Saul Wold --- diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 9f28283570..e32ad791ec 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