[systemd-devel] [PATCH v2] efi-boot-generator: Continue if /boot does not exist

[Zbigniew Jędrzejewski-Szmek]

On Sun, Apr 12, 2015 at 06:49:41PM +0200, Lennart Poettering wrote:
> On Sat, 11.04.15 02:13, Tobias Hunger (tobias.hunger at gmail.com) wrote:
> 
> > /boot does not exist on a stateless system, so do not get
> > confused by that.
> > ---
> >  src/efi-boot-generator/efi-boot-generator.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
> > index 58c4cc2..5a9bfd3 100644
> > --- a/src/efi-boot-generator/efi-boot-generator.c
> > +++ b/src/efi-boot-generator/efi-boot-generator.c
> > @@ -68,7 +68,10 @@ int main(int argc, char *argv[]) {
> >                  return EXIT_SUCCESS;
> >          }
> >  
> > -        if (path_is_mount_point("/boot", true) <= 0 &&
> > +        r = path_is_mount_point("/boot", true);
> > +        if (r == -ENOENT) {
> > +                log_debug("/boot does not exist, continuing.");
> > +        } else if (r <= 0 &&
> >              dir_is_empty("/boot") <= 0) {
> >                  log_debug("/boot already populated, exiting.");
> >                  return EXIT_SUCCESS;
> 
> This was merged by Zbigniew earlier today.
Yeah, sorry I forgot to write to the mailing list.

I reformatted the patch a bit, I think it is more readable without
splitting the condition in two lines.

Zbyszek