<p dir="ltr"><br>
On 13 Jan 2014 18:02, "Burton, Ross" <ross.burton@intel.com> wrote:<br>
><br>
> If dnsmasq doesn't need to be manually masked, then why not just<br>
> remove it from the list?<br></p>
<p dir="ltr">Hm, good question... I guess I have to claim temporary stupidity. </p>
<p dir="ltr">I'll send a patch to remove dnsmasq from the list. </p>
<p dir="ltr">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. </p>
<p dir="ltr">Cheers, <br>
Anders </p>
<p dir="ltr">> Ross<br>
><br>
> On 10 January 2014 07:15, Anders Darander <anders@chargestorm.se> wrote:<br>
> > Do also check systemd_unitdir/system/ for available unit files.<br>
> ><br>
> > This was hiding dnsmasq.service for us, as /etc/systemd/system has<br>
> > priority over systemd_unitdir/system...<br>
> ><br>
> > Signed-off-by: Anders Darander <anders@chargestorm.se><br>
> > ---<br>
> >  meta/recipes-core/systemd/systemd-compat-units.bb | 2 +-<br>
> >  1 file changed, 1 insertion(+), 1 deletion(-)<br>
> ><br>
> > diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb<br>
> > index 9f28283..e32ad79 100644<br>
> > --- a/meta/recipes-core/systemd/systemd-compat-units.bb<br>
> > +++ b/meta/recipes-core/systemd/systemd-compat-units.bb<br>
> > @@ -42,7 +42,7 @@ pkg_postinst_${PN} () {<br>
> >         fi<br>
> ><br>
> >         for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do<br>
> > -               if [ \( -e $i -o $i.sh \) -a ! -e $D${sysconfdir}/systemd/system/$i.service ] ; then<br>
> > +               if [ \( -e $i -o $i.sh \) -a ! \( -e $D${sysconfdir}/systemd/system/$i.service -o  -e $D${systemd_unitdir}/system/$i.service \) ] ; then<br>
> >                         echo -n "$i: " ; systemctl ${OPTS} mask $i.service<br>
> >                 fi<br>
> >         done ; echo<br>
> > --<br>
> > 1.8.5.2<br>
> ><br>
> > _______________________________________________<br>
> > Openembedded-core mailing list<br>
> > Openembedded-core@lists.openembedded.org<br>
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core<br>
</p>