[OE-core] [PATCH 1/1] systemd-compat-units: do not mask available services

[Anders Darander]

On 13 Jan 2014 18:02, "Burton, Ross" <ross.burton at intel.com> wrote:
>
> If dnsmasq doesn't need to be manually masked, then why not just
> remove it from the list?

Hm, good question... I guess I have to claim temporary stupidity.

I'll send a patch to remove dnsmasq from the list.

Though, I still think that we should check for service files insert systemd_unitdir and not only check /etc/systemd/system... So I think I'll claim that the patch is correct anyway, though.

Cheers,
Anders

> Ross
>
> On 10 January 2014 07:15, Anders Darander <anders at chargestorm.se> wrote:
> > 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>
> > ---
> >  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 at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20140113/f58b33a2/attachment-0002.html>