[systemd-devel] [PATCH 0/3] move timeout handling out of the core

[Lennart Poettering]

On Sat, 28.06.14 06:00, Zbigniew Jędrzejewski-Szmek (zbyszek at in.waw.pl) wrote:

Heya,

> this patch series continues the trend of moving stuff out of
> the core into generators. As a prerequisite for 3/3, it was
> necessary to move some code from core to shared. If comments
> are not counted, series is line-count-wise neutral, but I think
> it makes things cleaner and easier to introspect.

I think I agree with this. The only reason I could think of why this
might not be the right thing to do is to be nice to folks who wrote
native mount units who want to use the mount option. Because this way
the mount option becomes specific to fstab and cannot be used
otherwise... (Which actually is exactly what we do for
x-systemd.automount, which makes this all feel quite OK)

I never liked the patching of the device unit's timeout the way we so
far did. I feel quite a bit more comfortable with the way you propose as
we never patch, we always have readable files in the fs...

Anyway, looks good to me. We need to document though that both
x-sytemd.automount and x-systemd.device-timeout= strictly only work in
fstab and not otherwise.

> Zbigniew Jędrzejewski-Szmek (3):
>   1/3 Move x-systemd-device.timeout handling from core to fstab-generator
>   2/3 fstab-generator: allow x-systemd.device-timeout for swap units
>   3/3 cryptsetup: allow x-systemd.device-timeout
> 
>  Makefile.am                           |   8 ++-
>  src/core/mount.c                      |  55 ------------------
>  src/core/unit.c                       |  70 ++++++++++-------------
>  src/cryptsetup/cryptsetup-generator.c |  25 ++++-----
>  src/fstab-generator/fstab-generator.c |  17 +++++-
>  src/shared/dropin.c                   | 102 ++++++++++++++++++++++++++++++++++
>  src/shared/dropin.h                   |  31 +++++++++++
>  src/shared/generator.c                |  66 ++++++++++++++++++++++
>  src/shared/generator.h                |   3 +
>  src/shared/path-lookup.h              |   2 +
>  10 files changed, 264 insertions(+), 115 deletions(-)
>  create mode 100644 src/shared/dropin.c
>  create mode 100644 src/shared/dropin.h
> 


Lennart

-- 
Lennart Poettering, Red Hat