[OE-core] [PATCH V3 2/3] systemd: Verify if journal-flush.service exists.

[Bottazzini, Bruno]

On Qui, 2015-05-07 at 20:49 +0200, Andreas Oberritter wrote:
> Hello Bruno,
> 
> On 07.05.2015 18:40, Bruno Bottazzini wrote:
> > If the users wants to enable networkd this file will not be generate and the
> > installation will fail.
> > 
> > Signed-off-by: Bruno Bottazzini <bruno.bottazzini at intel.com>
> > ---
> >  meta/recipes-core/systemd/systemd_219.bb | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
> > index c196017..b4bff18 100644
> > --- a/meta/recipes-core/systemd/systemd_219.bb
> > +++ b/meta/recipes-core/systemd/systemd_219.bb
> > @@ -177,8 +177,11 @@ do_install() {
> >  	sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf
> >  	# its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d
> >  	# don't order journal flushing afte remote-fs.target
> > -	sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service
> > -	# this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it
> > +	if [ -s ${D}${systemd_unitdir}/system/systemd-journal-flush.service ]; then
> > +                # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it
> > +                sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service
> > +        fi
> > +
> 
> According to the comment above, this is a workaround specific to 216.
> Commit 919699ec301ea507edce4a619141ed22e789ac0d made it into 218. So
> maybe these lines should just get removed.

Andreas,

You are right.

I have checked and tested. It is upstreamed and It is not needed.

I will remove it and send another patch.

Best Regards,

> Regards,
> Andreas