summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2014-01-10 08:15:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-14 11:33:51 +0000
commitf543a8e77f19070243c55166e161bc360eb40495 (patch)
treeaad97fda3965821ee94af884ad6aa54a75e37298
parentaf5e69360d88bd18ccc3b92400ab4286085d2169 (diff)
downloadpoky-f543a8e77f19070243c55166e161bc360eb40495.tar.gz
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... (From OE-Core rev: 5aea3d375b717d96f8f916f2f830e8f8649a4991) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units.bb2
1 files changed, 1 insertions, 1 deletions
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} () {
42 fi 42 fi
43 43
44 for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do 44 for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
45 if [ \( -e $i -o $i.sh \) -a ! -e $D${sysconfdir}/systemd/system/$i.service ] ; then 45 if [ \( -e $i -o $i.sh \) -a ! \( -e $D${sysconfdir}/systemd/system/$i.service -o -e $D${systemd_unitdir}/system/$i.service \) ] ; then
46 echo -n "$i: " ; systemctl ${OPTS} mask $i.service 46 echo -n "$i: " ; systemctl ${OPTS} mask $i.service
47 fi 47 fi
48 done ; echo 48 done ; echo